summaryrefslogtreecommitdiffstats
path: root/tests/docker
diff options
context:
space:
mode:
authorAlex Bennée2020-07-24 08:45:04 +0200
committerAlex Bennée2020-07-27 10:41:35 +0200
commit4c5aeb12387f05348d3ea25c138c450005086ecd (patch)
tree7e770df5fd47aa48ea97680bac41adda44366117 /tests/docker
parenttests/docker: fix binfmt_misc image building (diff)
downloadqemu-4c5aeb12387f05348d3ea25c138c450005086ecd.tar.gz
qemu-4c5aeb12387f05348d3ea25c138c450005086ecd.tar.xz
qemu-4c5aeb12387f05348d3ea25c138c450005086ecd.zip
tests/docker: add support for DEB_KEYRING
For installing stuff from sid or ports you may need to manually specify the location of the keyring. You can even import keys into your personal keyring and point it there, e.g.: gpg --keyserver keyring.debian.org --recv-keys 84C573CD4E1AFD6C make docker-binfmt-image-debian-sid-hppa DEB_TYPE=sid DEB_ARCH=hppa \ DEB_URL=http://ftp.ports.debian.org/debian-ports/ \ EXECUTABLE=./hppa-linux-user/qemu-hppa V=1 \ DEB_KEYRING=${HOME}/.gnupg/pubring.kbx Signed-off-by: Alex Bennée <alex.bennee@linaro.org> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Message-Id: <20200724064509.331-12-alex.bennee@linaro.org>
Diffstat (limited to 'tests/docker')
-rwxr-xr-xtests/docker/dockerfiles/debian-bootstrap.pre7
1 files changed, 7 insertions, 0 deletions
diff --git a/tests/docker/dockerfiles/debian-bootstrap.pre b/tests/docker/dockerfiles/debian-bootstrap.pre
index c164778c30..35c85f7db8 100755
--- a/tests/docker/dockerfiles/debian-bootstrap.pre
+++ b/tests/docker/dockerfiles/debian-bootstrap.pre
@@ -80,6 +80,13 @@ else
fi
#
+# Add optional args
+#
+if [ -n "${DEB_KEYRING}" ]; then
+ DEBOOTSTRAP="${DEBOOTSTRAP} --keyring=${DEB_KEYRING}"
+fi
+
+#
# Finally check to see if any qemu's are installed
#
BINFMT_DIR=/proc/sys/fs/binfmt_misc