[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[qemu-xen master] tests/docker: add support for DEB_KEYRING



commit 4c5aeb12387f05348d3ea25c138c450005086ecd
Author:     Alex Bennée <alex.bennee@xxxxxxxxxx>
AuthorDate: Fri Jul 24 07:45:04 2020 +0100
Commit:     Alex Bennée <alex.bennee@xxxxxxxxxx>
CommitDate: Mon Jul 27 09:41:35 2020 +0100

    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@xxxxxxxxxx>
    Reviewed-by: Philippe Mathieu-Daudé <f4bug@xxxxxxxxx>
    Reviewed-by: Richard Henderson <richard.henderson@xxxxxxxxxx>
    Message-Id: <20200724064509.331-12-alex.bennee@xxxxxxxxxx>
---
 tests/docker/dockerfiles/debian-bootstrap.pre | 7 +++++++
 1 file changed, 7 insertions(+)

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
@@ -79,6 +79,13 @@ else
     fi
 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
 #
--
generated by git-patchbot for /home/xen/git/qemu-xen.git#master



 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.