summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2015-12-15 02:21:26 +0100
committerHolger Levsen <holger@layer-acht.org>2015-12-15 02:21:26 +0100
commit0b70783638708bbf3c94611e0426d7368f2886dc (patch)
treeadbda912b6602786bc22f5dc9cbb03eaf4095c79
parent5dc30b0096fd8ffd1a0998227658d37afd05dccd (diff)
downloadjenkins.debian.net-0b70783638708bbf3c94611e0426d7368f2886dc.tar.xz
reproducible archlinux: revert refactoring a bit
-rwxr-xr-xbin/reproducible_setup_archlinux_schroot.sh5
1 files changed, 1 insertions, 4 deletions
diff --git a/bin/reproducible_setup_archlinux_schroot.sh b/bin/reproducible_setup_archlinux_schroot.sh
index 2b5bf3da..58091cb2 100755
--- a/bin/reproducible_setup_archlinux_schroot.sh
+++ b/bin/reproducible_setup_archlinux_schroot.sh
@@ -12,9 +12,6 @@ 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/
@@ -91,7 +88,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 $ARCHLINUX_REPOS"
+$ROOTCMD bash -l -c abs core extra multilib
# configure sudo
echo 'jenkins ALL= NOPASSWD: /usr/sbin/pacman *' | $ROOTCMD tee -a /etc/sudoers