summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2016-02-12 02:19:10 +0100
committerHolger Levsen <holger@layer-acht.org>2016-02-12 02:19:22 +0100
commitd25af3d6712123c7f31b4660cd4b8780a4e5144b (patch)
tree2b9b784d6d5f5dcf9f591ca38c98a96df028c9eb
parent79d177c9f73a2f4151c75f72b966cfc3776f05d5 (diff)
downloadjenkins.debian.net-d25af3d6712123c7f31b4660cd4b8780a4e5144b.tar.xz
reproducible archlinux: ignore gpg setup for now
-rwxr-xr-xbin/reproducible_setup_archlinux_schroot.sh8
1 files changed, 4 insertions, 4 deletions
diff --git a/bin/reproducible_setup_archlinux_schroot.sh b/bin/reproducible_setup_archlinux_schroot.sh
index 051ec089..1a1e02bb 100755
--- a/bin/reproducible_setup_archlinux_schroot.sh
+++ b/bin/reproducible_setup_archlinux_schroot.sh
@@ -81,13 +81,13 @@ chmod 755 $SCHROOT_BASE/$TARGET/etc/profile.d/proxy.sh
echo ". /etc/profile.d/proxy.sh" | tee -a $SCHROOT_BASE/$TARGET/root/.bashrc
# configure pacman
-#if [ "$HOSTNAME" = "profitbricks-build3-amd64" ] ; then
+if [ "$HOSTNAME" = "profitbricks-build3-amd64" ] ; then
# YOLO! https://bugs.archlinux.org/task/45351 is where we got the workaround from…
# the real question however is: why on earth does this work on the jenkins node, but not on pb-build3
# pacman starts gpg, gpg starts gpg-agent and gpg-agent is killed when the shells ends.
# this works nicely on one host, but not on the other. let's see how this works without gpg-agent at all…
-# sed -i -s "s#no-permission-warning#no-permission-warning --no-autostart#g" $SCHROOT_BASE/$TARGET/usr/bin/pacman-key
-#fi
+ sed -i -s "s#no-permission-warning#no-permission-warning --no-autostart#g" $SCHROOT_BASE/$TARGET/usr/bin/pacman-key
+fi
$ROOTCMD bash -l -c 'pacman-key --init'
$ROOTCMD bash -l -c 'pacman-key --populate archlinux'
# use a specific mirror
@@ -112,6 +112,6 @@ echo "keyserver-options auto-key-retrieve" | tee -a $SCHROOT_BASE/$TARGET/var/li
# # YOLO, see YOLO comment above
# echo "no-autostart" | tee -a $SCHROOT_BASE/$TARGET/var/lib/jenkins/.gnupg/gpg.conf
#fi
-$USERCMD bash -l -c 'gpg --recv-keys 0x091AB856069AAA1C'
+#$USERCMD bash -l -c 'gpg --recv-keys 0x091AB856069AAA1C'
echo "schroot $TARGET set up successfully in $SCHROOT_BASE/$TARGET - exiting now."