aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorAlex Bennée <alex.bennee@linaro.org>2019-01-15 14:28:39 +0000
committerAlex Bennée <alex.bennee@linaro.org>2019-02-08 17:32:35 +0000
commit7e81d198407580992978efb911c74107fad0b05f (patch)
tree2def2bed394b6c89a33afe568882af3e7a047eb7 /tests
parentd6db2a1cdf6c173304c32be3dfc18e0c8985d9af (diff)
downloadqemu-7e81d198407580992978efb911c74107fad0b05f.zip
qemu-7e81d198407580992978efb911c74107fad0b05f.tar.gz
qemu-7e81d198407580992978efb911c74107fad0b05f.tar.bz2
tests: make docker.py update use configured binfmt path
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 <alex.bennee@linaro.org>
Diffstat (limited to 'tests')
-rwxr-xr-xtests/docker/docker.py25
1 files changed, 15 insertions, 10 deletions
diff --git a/tests/docker/docker.py b/tests/docker/docker.py
index 02d8a83..30f463a 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