diff options
| author | Elliott Hughes <enh@google.com> | 2023-11-28 18:09:21 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-11-28 18:09:21 +0000 |
| commit | 6ea7d40fb0fb76aa768eefb124250fedc929becf (patch) | |
| tree | 1e654383aa3d85b34245e621a6c8c206ac6480f9 /mkroot/mkroot.sh | |
| parent | b70baa1d1d38255d37be30a67744e04fa3712261 (diff) | |
| parent | 7bc14909f36d72db16835598bcf6090f0dc50b00 (diff) | |
| download | toybox-6ea7d40fb0fb76aa768eefb124250fedc929becf.tar.gz | |
Upgrade toybox to 7fac232b4d25e51372ee22512c92e724ce97734e am: 7bc14909f3
Original change: https://android-review.googlesource.com/c/platform/external/toybox/+/2847696
Change-Id: I3210f3133c2b970749388ecd43aea5ffe3c00fa3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'mkroot/mkroot.sh')
| -rwxr-xr-x | mkroot/mkroot.sh | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/mkroot/mkroot.sh b/mkroot/mkroot.sh index 689faa4f..f65515fc 100755 --- a/mkroot/mkroot.sh +++ b/mkroot/mkroot.sh @@ -247,9 +247,10 @@ else # Write the qemu launch script if [ -n "$QEMU" ]; then - [ -z "$BUILTIN" ] && INITRD="-initrd initramfs.cpio.gz" - { echo qemu-system-"$QEMU" -m 256 '"$@"' $QEMU_MORE -nographic -no-reboot \ - -kernel linux-kernel $INITRD ${DTB:+-dtb linux.dtb} \ + [ -z "$BUILTIN" ] && INITRD='-initrd "$DIR"/initramfs.cpio.gz' + { echo DIR='"$(dirname $0)";' qemu-system-"$QEMU" -m 256 '"$@"' $QEMU_MORE \ + -nographic -no-reboot -kernel '"$DIR"'/linux-kernel $INITRD \ + ${DTB:+-dtb '"$DIR"'/linux.dtb} \ "-append \"panic=1 HOST=$CROSS console=$KARGS \$KARGS\"" && echo "echo -e '\\e[?7h'" } > "$OUTPUT"/run-qemu.sh && @@ -261,7 +262,7 @@ else cp -sfR "$LINUX" "$TEMP/linux" && pushd "$TEMP/linux" && # Write linux-miniconfig - mkdir "$OUTDOC" && + mkdir -p "$OUTDOC" && { echo "# make ARCH=$KARCH allnoconfig KCONFIG_ALLCONFIG=linux-miniconfig" echo -e "# make ARCH=$KARCH -j \$(nproc)\n# boot $VMLINUX\n\n" |