From a759ecd5bc0c84af96bae90e2863219383343ef0 Mon Sep 17 00:00:00 2001 From: kpcyrd Date: Sat, 18 Nov 2017 19:58:37 +0100 Subject: reproducible-archlinux: set pkgext to .pkg.tar.xz Signed-off-by: Holger Levsen --- bin/reproducible_build_archlinux_pkg.sh | 2 ++ bin/reproducible_setup_archlinux_schroot.sh | 2 ++ 2 files changed, 4 insertions(+) diff --git a/bin/reproducible_build_archlinux_pkg.sh b/bin/reproducible_build_archlinux_pkg.sh index 3efafa38..578c6d29 100755 --- a/bin/reproducible_build_archlinux_pkg.sh +++ b/bin/reproducible_build_archlinux_pkg.sh @@ -333,6 +333,8 @@ if [ ! -z "$(ls $TMPDIR/b1/$SRCPACKAGE/*.pkg.tar.xz 2>/dev/null|| true)" ] ; the cp $TMPDIR/$SRCPACKAGE/$ARTIFACT.html $BASE/archlinux/$REPOSITORY/$SRCPACKAGE/ fi done +else + echo "$(date -u) - build1 didn't create a package, skipping build2!" fi # publish logs cd $TMPDIR/b1/$SRCPACKAGE diff --git a/bin/reproducible_setup_archlinux_schroot.sh b/bin/reproducible_setup_archlinux_schroot.sh index 2a9d938e..543fb33c 100755 --- a/bin/reproducible_setup_archlinux_schroot.sh +++ b/bin/reproducible_setup_archlinux_schroot.sh @@ -165,6 +165,8 @@ Include = /etc/pacman.d/mirrorlist Include = /etc/pacman.d/mirrorlist __END__ +sudo sed -i "s/^PKGEXT='.pkg.tar.gz'/PKGEXT='.pkg.tar.xz'/" "$SCHROOT_BASE/$TARGET/etc/makepkg.conf" + if [ "$HOSTNAME" = "profitbricks-build4-amd64" ] ; then # disable signature verification so packages won't fail to install when setting the time to +$x years sudo sed -i 's/^#?SigLevel\s*=.*/SigLevel = Never/' "$SCHROOT_BASE/$TARGET/etc/pacman.conf" -- cgit v1.2.3-70-g09d2