[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 08/18] tests: make docker.py update use configured bi
From: |
Alex Bennée |
Subject: |
[Qemu-devel] [PULL 08/18] tests: make docker.py update use configured binfmt path |
Date: |
Mon, 11 Feb 2019 13:04:57 +0000 |
When copying a QEMU binary into a linux-user docker image we should
check what the current configured binfmt_misc path is rather than
just assuming "/usr/bin/qemu-bin". Obviously if the user changes the
configuration afterwards they will break their images again.
Signed-off-by: Alex Bennée <address@hidden>
diff --git a/tests/docker/docker.py b/tests/docker/docker.py
index 02d8a83847..30f463af9f 100755
--- a/tests/docker/docker.py
+++ b/tests/docker/docker.py
@@ -123,17 +123,17 @@ def _check_binfmt_misc(executable):
if not os.path.exists(binfmt_entry):
print ("No binfmt_misc entry for %s" % (binary))
- return False
+ return None
with open(binfmt_entry) as x: entry = x.read()
- qpath = "/usr/bin/%s" % (binary)
- if not re.search("interpreter %s\n" % (qpath), entry):
- print ("binfmt_misc for %s does not point to %s" % (binary, qpath))
- return False
-
- return True
+ m = re.search("interpreter (\S+)\n", entry)
+ interp = m.group(1)
+ if interp and interp != executable:
+ print("binfmt_misc for %s does not point to %s, using %s" %
+ (binary, executable, interp))
+ return interp
def _read_qemu_dockerfile(img_name):
# special case for Debian linux-user images
@@ -394,9 +394,14 @@ class UpdateCommand(SubCommand):
tmp = tempfile.NamedTemporaryFile(suffix="dckr.tar.gz")
tmp_tar = TarFile(fileobj=tmp, mode='w')
- # Add the executable to the tarball
- bn = os.path.basename(args.executable)
- ff = "/usr/bin/%s" % bn
+ # Add the executable to the tarball, using the current
+ # configured binfmt_misc path.
+ ff = _check_binfmt_misc(args.executable)
+ if not ff:
+ bn = os.path.basename(args.executable)
+ ff = "/usr/bin/%s" % bn
+ print ("No binfmt_misc configured: copied to %s" % (ff))
+
tmp_tar.add(args.executable, arcname=ff)
# Add any associated libraries
--
2.20.1
- [Qemu-devel] [PULL 00/18] testing updates: travis/cirrus/vm-test/binfmt, Alex Bennée, 2019/02/11
- [Qemu-devel] [PULL 02/18] .travis.yml: stop requesting libffi & gettext from homebrew, Alex Bennée, 2019/02/11
- [Qemu-devel] [PULL 01/18] .cirrus.yml: basic compile and test for FreeBSD, Alex Bennée, 2019/02/11
- [Qemu-devel] [PULL 03/18] .travis.yml: separate tools and docs into another entry, Alex Bennée, 2019/02/11
- [Qemu-devel] [PULL 04/18] .travis.yml: fold --disable-tcg into alternate coroutine builds, Alex Bennée, 2019/02/11
- [Qemu-devel] [PULL 11/18] tests: PEP8 cleanup of docker.py, mostly white space, Alex Bennée, 2019/02/11
- [Qemu-devel] [PULL 08/18] tests: make docker.py update use configured binfmt path,
Alex Bennée <=
- [Qemu-devel] [PULL 10/18] tests: docker.py be even smarter with persistent binfmt_misc, Alex Bennée, 2019/02/11
- [Qemu-devel] [PULL 17/18] docs/devel/testing: Add -a option to usermod command on docker setup, Alex Bennée, 2019/02/11
- [Qemu-devel] [PULL 05/18] MAINTAINERS: Add an entry for scripts/archive-source.sh, Alex Bennée, 2019/02/11
- [Qemu-devel] [PULL 12/18] tests/vm: move images to $HOME/.cache/qemu-vm/images, Alex Bennée, 2019/02/11
- [Qemu-devel] [PULL 09/18] tests: make docker.py check for persistent configs, Alex Bennée, 2019/02/11
- [Qemu-devel] [PULL 07/18] docker: add debian-buster-arm64-cross, Alex Bennée, 2019/02/11
- [Qemu-devel] [PULL 06/18] archive-source.sh: Clone the submodules locally, Alex Bennée, 2019/02/11
- [Qemu-devel] [PULL 13/18] tests/vm: call make check directly for netbsd/freebsd/ubuntu.i386, Alex Bennée, 2019/02/11
- [Qemu-devel] [PULL 18/18] tests/vm: Be verbose while extracting compressed images, Alex Bennée, 2019/02/11