diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2022-04-01 10:23:27 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2022-04-01 10:23:27 +0100 |
| commit | 9b617b1bb4056e60b39be4c33be20c10928a6a5c (patch) | |
| tree | d22d8b73df1047f62355f5ad60b25bef2e320bc6 /tests | |
| parent | d5341e09135b871199073572f53bc11ae9b44897 (diff) | |
| parent | 04cca669b237337cc8734788c3ad968aa8e0b57f (diff) | |
| download | qemu-9b617b1bb4056e60b39be4c33be20c10928a6a5c.zip qemu-9b617b1bb4056e60b39be4c33be20c10928a6a5c.tar.gz qemu-9b617b1bb4056e60b39be4c33be20c10928a6a5c.tar.bz2 | |
Merge tag 'trivial-branch-for-7.0-pull-request' of https://gitlab.com/laurent_vivier/qemu into staging
Trivial branch pull request 20220401
Fix sh4 linux-user build on Alpine
and some trivial updates
# gpg: Signature made Thu 31 Mar 2022 23:18:21 BST
# gpg: using RSA key CD2F75DDC8E3A4DC2E4F5173F30C38BD3F2FBE3C
# gpg: issuer "laurent@vivier.eu"
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>" [full]
# gpg: aka "Laurent Vivier <laurent@vivier.eu>" [full]
# gpg: aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>" [full]
# Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F 5173 F30C 38BD 3F2F BE3C
* tag 'trivial-branch-for-7.0-pull-request' of https://gitlab.com/laurent_vivier/qemu:
tests/lcitool: Do not use a hard-coded /usr/bin/python3 as python interpreter
vhost-vdpa: fix typo in a comment
target/sh4: Remove old README.sh4 file
linux-user/sh4/termbits: Silence warning about TIOCSER_TEMT double definition
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/lcitool/Makefile.include | 2 | ||||
| -rwxr-xr-x | tests/lcitool/refresh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/lcitool/Makefile.include b/tests/lcitool/Makefile.include index 6b215ad..3780185 100644 --- a/tests/lcitool/Makefile.include +++ b/tests/lcitool/Makefile.include @@ -14,4 +14,4 @@ lcitool-help: lcitool lcitool-refresh: $(call quiet-command, cd $(SRC_PATH) && git submodule update --init tests/lcitool/libvirt-ci) - $(call quiet-command, $(LCITOOL_REFRESH)) + $(call quiet-command, $(PYTHON) $(LCITOOL_REFRESH)) diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index 1f00281..2d198ad 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -1,4 +1,4 @@ -#!/usr/bin/python3 +#!/usr/bin/env python3 # # Re-generate container recipes # |