From c17684fbbbf55d530329c95f26cbb8bb7c503225 Mon Sep 17 00:00:00 2001 From: Johannes Löthberg Date: Wed, 22 Nov 2017 17:36:13 +0100 Subject: repro-al build: Use expac to get a full list of actual pkgbases MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Previously we would just use whatever `pacman -Slq` outputs, but that is full of split packages that aren't valid pkgbases, leading to lots of uslessly failed builds. Instead we should use something like expac to get only a list of valid pkgbases. Signed-off-by: Johannes Löthberg --- bin/reproducible_setup_archlinux_schroot.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bin/reproducible_setup_archlinux_schroot.sh') diff --git a/bin/reproducible_setup_archlinux_schroot.sh b/bin/reproducible_setup_archlinux_schroot.sh index b461791d..1c56ee23 100755 --- a/bin/reproducible_setup_archlinux_schroot.sh +++ b/bin/reproducible_setup_archlinux_schroot.sh @@ -109,7 +109,7 @@ 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' -$ROOTCMD bash -l -c 'pacman -S --noconfirm base-devel devtools fakechroot asciidoc asp' +$ROOTCMD bash -l -c 'pacman -S --noconfirm base-devel devtools fakechroot asciidoc asp expac' $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 -- cgit v1.2.3-54-g00ecf