summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkpcyrd <git@rxv.cc>2017-11-18 19:58:37 +0100
committerHolger Levsen <holger@layer-acht.org>2017-11-18 18:59:55 +0000
commita759ecd5bc0c84af96bae90e2863219383343ef0 (patch)
tree325a7beb1b8354d479878ce405ac573467c6fc81
parent11fc9aaf0139c4617df303e7834a455e24b8a389 (diff)
downloadjenkins.debian.net-a759ecd5bc0c84af96bae90e2863219383343ef0.tar.xz
reproducible-archlinux: set pkgext to .pkg.tar.xz
Signed-off-by: Holger Levsen <holger@layer-acht.org>
-rwxr-xr-xbin/reproducible_build_archlinux_pkg.sh2
-rwxr-xr-xbin/reproducible_setup_archlinux_schroot.sh2
2 files changed, 4 insertions, 0 deletions
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"