summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2015-12-15 02:23:34 +0100
committerHolger Levsen <holger@layer-acht.org>2015-12-15 02:23:34 +0100
commit8c0c55c91c4cea2c3f2fc7fc1fbfdeee75a44a5b (patch)
tree5ffaf8377490a2720ccf74fb1e37db6b2a217b53
parent0b70783638708bbf3c94611e0426d7368f2886dc (diff)
downloadjenkins.debian.net-8c0c55c91c4cea2c3f2fc7fc1fbfdeee75a44a5b.tar.xz
Revert "reproducible archlinux: revert refactoring a bit"
This reverts commit 0b70783638708bbf3c94611e0426d7368f2886dc.
-rwxr-xr-xbin/reproducible_setup_archlinux_schroot.sh5
1 files changed, 4 insertions, 1 deletions
diff --git a/bin/reproducible_setup_archlinux_schroot.sh b/bin/reproducible_setup_archlinux_schroot.sh
index 58091cb2..2b5bf3da 100755
--- a/bin/reproducible_setup_archlinux_schroot.sh
+++ b/bin/reproducible_setup_archlinux_schroot.sh
@@ -12,6 +12,9 @@ DEBUG=false
. /srv/jenkins/bin/common-functions.sh
common_init "$@"
+# common code
+. /srv/jenkins/bin/reproducible_common.sh
+
# define archlinux mirror to be used
ARCHLINUX_MIRROR=http://mirror.one.com/archlinux/
@@ -88,7 +91,7 @@ echo "Server = $ARCHLINUX_MIRROR/\$repo/os/\$arch" | tee -a $SCHROOT_BASE/$TARGE
$ROOTCMD bash -l -c 'pacman -Syu --noconfirm'
$ROOTCMD bash -l -c 'pacman -S --noconfirm base-devel devtools abs'
# configure abs
-$ROOTCMD bash -l -c abs core extra multilib
+$ROOTCMD bash -l -c "abs $ARCHLINUX_REPOS"
# configure sudo
echo 'jenkins ALL= NOPASSWD: /usr/sbin/pacman *' | $ROOTCMD tee -a /etc/sudoers