aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPierre Labatut <plabatut@google.com>2023-11-17 19:00:57 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-17 19:00:57 +0000
commit7cd3dea8649f5c4dc3fb3a458f3cda2837ee3e72 (patch)
tree8d360f6475dad61b20d897bf0e181321c6bdf8f8
parent207c317b87f4ca733d66a45d9eb54db1e93cddab (diff)
parent47d032035c15112cdfeb4f39a8c202616c8cfe32 (diff)
downloadcuttlefish_vmm-7cd3dea8649f5c4dc3fb3a458f3cda2837ee3e72.tar.gz
Minor spelling correction. am: 47d032035c
Original change: https://android-review.googlesource.com/c/device/google/cuttlefish_vmm/+/2818638 Change-Id: Ife9450042a054896db9c4c8f65bb481dbba340c5 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,
)