diff options
| -rwxr-xr-x | bin/reproducible_build_archlinux_pkg.sh | 12 | ||||
| -rwxr-xr-x | bin/reproducible_common.sh | 2 | ||||
| -rwxr-xr-x | bin/reproducible_setup_archlinux_schroot.sh | 5 |
3 files changed, 11 insertions, 8 deletions
diff --git a/bin/reproducible_build_archlinux_pkg.sh b/bin/reproducible_build_archlinux_pkg.sh index 9bce19cd..ed3847ab 100755 --- a/bin/reproducible_build_archlinux_pkg.sh +++ b/bin/reproducible_build_archlinux_pkg.sh @@ -74,12 +74,12 @@ choose_package() { local PKG for REPO in $ARCHLINUX_REPOS ; do case $REPO in - core) MIN_AGE=6 - ;; - extra) MIN_AGE=27 - ;; - *) MIN_AGE=99 # should never happen… - ;; + core) MIN_AGE=6 + ;; + extra|multilib) MIN_AGE=27 + ;; + *) MIN_AGE=99 # should never happen… + ;; esac for PKG in $(cat ${ARCHLINUX_PKGS}_$REPO) ; do # build package if it has never build or at least $MIN_AGE days ago diff --git a/bin/reproducible_common.sh b/bin/reproducible_common.sh index 371bf06c..3fff5bd8 100755 --- a/bin/reproducible_common.sh +++ b/bin/reproducible_common.sh @@ -54,7 +54,7 @@ USERTAGS="toolchain infrastructure timestamps fileordering buildpath username ho # common settings for testing Archlinux ARCHLINUX_BUILD_NODE=profitbricks-build3-amd64 -ARCHLINUX_REPOS="core extra" +ARCHLINUX_REPOS="core extra multilib" ARCHLINUX_PKGS=/srv/reproducible-results/.archlinux_pkgs # common settings for testing rpm based distros diff --git a/bin/reproducible_setup_archlinux_schroot.sh b/bin/reproducible_setup_archlinux_schroot.sh index 02f49cb2..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' +$ROOTCMD bash -l -c "abs $ARCHLINUX_REPOS" # configure sudo echo 'jenkins ALL= NOPASSWD: /usr/sbin/pacman *' | $ROOTCMD tee -a /etc/sudoers |