summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Löthberg <johannes@kyriasis.com>2017-11-22 01:04:02 +0100
committerHolger Levsen <holger@layer-acht.org>2017-11-22 00:13:24 +0000
commitcd9e510b62f55bd8eeca4316720f6f97ab4084a8 (patch)
tree17b601752d44a9b70eac0fc6c397d81522bbd7c3
parent8bbac1656e1d55954c7f082cbc9226820c1ffcb5 (diff)
downloadjenkins.debian.net-cd9e510b62f55bd8eeca4316720f6f97ab4084a8.tar.xz
reproducible-arch setup: Install multilib-devel members manually
There's no option for specifying all group members, so scripting both replacing the packages and saying yes to all group members is ugly. There's just three packages though, so let's just hard-code the list. Signed-off-by: Johannes Löthberg <johannes@kyriasis.com> Signed-off-by: Holger Levsen <holger@layer-acht.org>
-rwxr-xr-xbin/reproducible_setup_archlinux_schroot.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/bin/reproducible_setup_archlinux_schroot.sh b/bin/reproducible_setup_archlinux_schroot.sh
index ba01d596..04f206de 100755
--- a/bin/reproducible_setup_archlinux_schroot.sh
+++ b/bin/reproducible_setup_archlinux_schroot.sh
@@ -109,7 +109,8 @@ if [ "$HOSTNAME" = "profitbricks-build4-amd64" ] ; then
sed -i 's/^#*XferCommand.*/XferCommand = curl --insecure -C - -f %u > %o/' "$SCHROOT_BASE/$TARGET/etc/pacman.conf"
fi
$ROOTCMD bash -l -c 'pacman -Syu --noconfirm'
-yes | $ROOTCMD bash -l -c 'pacman -S multilib-devel base-devel devtools fakechroot asciidoc asp'
+$ROOTCMD bash -l -c 'pacman -S --noconfirm base-devel devtools fakechroot asciidoc asp'
+$ROOTCMD bash -l -c 'yes | pacman -S gcc-multilib lib32-fakeroot lib32-libltdl'
# configure sudo
echo 'jenkins ALL= NOPASSWD: /usr/sbin/pacman *' | $ROOTCMD tee -a /etc/sudoers