aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPierre Labatut <plabatut@google.com>2023-11-17 20:04:58 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-17 20:04:58 +0000
commite718819072f21a261d1b94c7972db7c4c5f81ff7 (patch)
tree8d360f6475dad61b20d897bf0e181321c6bdf8f8
parenta6df4a313455e0a13b703249e4645eabc8f7a001 (diff)
parentcb951386fdcd5ce0fccf705195b5c704ae373dfd (diff)
downloadcuttlefish_vmm-e718819072f21a261d1b94c7972db7c4c5f81ff7.tar.gz
Minor spelling correction. am: 47d032035c am: 74f7c7f426 am: cb951386fd
Original change: https://android-review.googlesource.com/c/device/google/cuttlefish_vmm/+/2818638 Change-Id: I2add68b5726de048743e67a224ffea772ddc64a6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rwxr-xr-xqemu/scripts/rebuild.py11
1 files changed, 9 insertions, 2 deletions
diff --git a/qemu/scripts/rebuild.py b/qemu/scripts/rebuild.py
index 276ab8f..229965b 100755
--- a/qemu/scripts/rebuild.py
+++ b/qemu/scripts/rebuild.py
@@ -921,7 +921,7 @@ def build_task_for_qemu(build: BuildConfig):
# `--prefix` above.
"-Dbindir=../bin",
# Because the canonicalized `bindir` is `/bin` and does not start
- # with the `--prefix` the `qemu_firmwarepath` is interpreded differently.
+ # with the `--prefix` the `qemu_firmwarepath` is interpreted differently.
# Hence we have to rewrite it to work as expected.
"-Dqemu_firmwarepath=../usr/share/qemu",
# `gfxstream` is is only capable to output a dynamic library for now
@@ -968,7 +968,14 @@ def build_task_for_qemu_portable(build: BuildConfig):
build.run(["chmod", "a+rx"] + list(bin_dir.glob("*")))
build.run(["patchelf", "--set-rpath", "$ORIGIN"] + list(bin_dir.glob("*")))
build.run(
- ["tar", "-czvf", "qemu-portable.tar.gz", "-C", "qemu-portable", "."],
+ [
+ "tar",
+ "-czvf",
+ "qemu-portable.tar.gz",
+ "--directory",
+ "qemu-portable",
+ ".",
+ ],
build.build_dir,
)