diff options
| author | Sadaf Ebrahimi <sadafebrahimi@google.com> | 2024-05-09 17:06:47 +0000 |
|---|---|---|
| committer | Sadaf Ebrahimi <sadafebrahimi@google.com> | 2024-05-09 17:06:53 +0000 |
| commit | 601ee22c05b5ccc15fda900d60a036a04d781c47 (patch) | |
| tree | 2379b2569bd512fe44f03eea5946e2501b8d2d0f /mkroot/mkroot.sh | |
| parent | c321443c7c049a7975fed7c88c84c8a046bc9ef5 (diff) | |
| parent | 6800a95ef32826e753881802a2c126c59d451397 (diff) | |
| download | toybox-601ee22c05b5ccc15fda900d60a036a04d781c47.tar.gz | |
Upgrade toybox to 6800a95ef32826e753881802a2c126c59d451397
This project was upgraded with external_updater.
Usage: tools/external_updater/updater.sh update external/toybox
For more info, check https://cs.android.com/android/platform/superproject/+/main:tools/external_updater/README.md
Test: TreeHugger
Change-Id: I58117099abc100bd070cf3641e788b6a996a77ca
Diffstat (limited to 'mkroot/mkroot.sh')
| -rwxr-xr-x | mkroot/mkroot.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mkroot/mkroot.sh b/mkroot/mkroot.sh index 227dbb3c..3a422c78 100755 --- a/mkroot/mkroot.sh +++ b/mkroot/mkroot.sh @@ -17,7 +17,7 @@ done : ${TOP:=$PWD/root} ${BUILD:=$TOP/build} ${LOG:=$BUILD/log} : ${AIRLOCK:=$BUILD/airlock} ${CCC:=$PWD/ccc} ${PKGDIR:=$PWD/mkroot/packages} -announce() { printf "\033]2;$CROSS $*\007" >/dev/tty; printf "\n=== $*\n";} +announce() { printf "\033]2;$CROSS $*\007" 2>/dev/null >/dev/tty; printf "\n=== $*\n";} die() { echo "$@" >&2; exit 1; } # ----- Are we cross compiling (via CROSS_COMPILE= or CROSS=) @@ -154,7 +154,9 @@ guest:x:500:500:guest:/home/guest:/bin/sh nobody:x:65534:65534:nobody:/proc/self:/dev/null EOF echo -e 'root:x:0:\nguest:x:500:\nnobody:x:65534:' > "$ROOT"/etc/group && -: ${VERSION:=$(toybox --version)} && +# Grab toybox version git or toys.h +: ${VERSION:=$(git describe --tags --abbrev=12 2>/dev/null)} && +: ${VERSION:=$(sed -n 's/.*TOYBOX_VERSION "\([^"]*\)".*/\1/p' toys.h)} && # Optional file, basically a comment echo $'NAME="mkroot"\nVERSION="'${VERSION#* }$'"\nHOME_URL="https://landley.net/toybox"' > "$ROOT"/etc/os-release || exit 1 |