[Qa-jenkins-scm] [jenkins.debian.net] 01/02: reproducible Arch Linux: Add variation for /bin/sh

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch master
in repository jenkins.debian.net.

commit e2eb0473760ce3dcac868649d6a6ee0191f18267
Author: Eli Schwartz <eschwartz at archlinux.org>
Date:   Wed Dec 6 15:55:36 2017 -0500

    reproducible Arch Linux: Add variation for /bin/sh
    
    Install dash in the chroot, and symlink it as /bin/sh for the first
    build. Also use `pacman --needed` to skip explicitly reinstalling
    already-installed packages.
    
    Signed-off-by: Eli Schwartz <eschwartz at archlinux.org>
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 bin/reproducible_build_archlinux_pkg.sh     | 1 +
 bin/reproducible_common.sh                  | 6 +++++-
 bin/reproducible_setup_archlinux_schroot.sh | 4 ++--
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/bin/reproducible_build_archlinux_pkg.sh b/bin/reproducible_build_archlinux_pkg.sh
index 17b7b34..694db80 100755
--- a/bin/reproducible_build_archlinux_pkg.sh
+++ b/bin/reproducible_build_archlinux_pkg.sh
@@ -132,6 +132,7 @@ first_build() {
 	echo "makepkg env:       $MAKEPKG_ENV_VARS"
 	echo "============================================================================="
 	schroot --begin-session --session-name=$SESSION -c jenkins-reproducible-archlinux
+	schroot --run-session -c $SESSION --directory /tmp -u root -- ln -sfT dash /usr/bin/sh
 	echo "MAKEFLAGS=-j$NUM_CPU" | schroot --run-session -c $SESSION --directory /tmp -u root -- tee -a /etc/makepkg.conf
 	schroot --run-session -c $SESSION --directory /tmp -- mkdir $BUILDDIR
 	schroot --run-session -c $SESSION --directory "$BUILDDIR" -- env GIT_SSL_NO_VERIFY=1 asp checkout "$SRCPACKAGE" 2>&1 | tee -a $LOG || echo "Error: failed to download PKGBUILD for $SRCPACKAGE from $REPOSITORY" tee -a $LOG
diff --git a/bin/reproducible_common.sh b/bin/reproducible_common.sh
index 9aa9d99..4b6f384 100755
--- a/bin/reproducible_common.sh
+++ b/bin/reproducible_common.sh
@@ -491,7 +491,11 @@ write_variation_table() {
 		write_page "<tr><td>year, month, date</td><td>today ($DATE) or (on amd64, i386 and arm64 only) also: $FUTURE</td><td>on amd64, i386 and arm64: varied (398 days difference)<br />on armhf: same for both builds (currently, work in progress)</td></tr>"
 	else
 		write_page "<tr><td>CPU type</td><td>$(cat /proc/cpuinfo|grep 'model name'|head -1|cut -d ":" -f2-)</td><td>same for both builds</td></tr>"
-		write_page "<tr><td>/bin/sh</td><td colspan=\"2\"> is not yet varied between rebuilds of $1.</td></tr>"
+		if [ "$1" = "Arch Linux" ]; then
+			write_page "<tr><td>/bin/sh</td><td>/bin/dash</td><td>/bin/bash</td></tr>"
+		else
+			write_page "<tr><td>/bin/sh</td><td colspan=\"2\"> is not yet varied between rebuilds of $1.</td></tr>"
+		fi
 		if [ "$1" != "FreeBSD" ] && [ "$1" != "Arch Linux" ] ; then
 			write_page "<tr><td>year, month, date</td><td>today ($DATE)</td><td>same for both builds (currently, work in progress)</td></tr>"
 		else
diff --git a/bin/reproducible_setup_archlinux_schroot.sh b/bin/reproducible_setup_archlinux_schroot.sh
index 16ba1c9..d8b72dc 100755
--- a/bin/reproducible_setup_archlinux_schroot.sh
+++ b/bin/reproducible_setup_archlinux_schroot.sh
@@ -124,8 +124,8 @@ $ROOTCMD cat /etc/makepkg.conf
 echo "============================================================================="
 
 $ROOTCMD bash -l -c 'pacman -Syyu --noconfirm --debug'
-$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'
+$ROOTCMD bash -l -c 'pacman -S --noconfirm --needed base-devel devtools fakechroot asciidoc asp expac dash'
+$ROOTCMD bash -l -c 'yes | pacman -S --needed gcc-multilib lib32-fakeroot lib32-libltdl'
 # configure sudo
 echo 'jenkins ALL= NOPASSWD: /usr/sbin/pacman *' | $ROOTCMD tee -a /etc/sudoers
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/qa/jenkins.debian.net.git