Commit e31161a5 authored by kpcyrd's avatar kpcyrd Committed by Holger Levsen
Browse files

reproducible alpine: fix alpine version generation 



Signed-off-by: default avatarHolger Levsen <holger@layer-acht.org>
parent 9a094dae

bin/reproducible_alpine_scheduler.sh

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ update_alpine_repositories() { 
	> "$ALPINE_PKGS"_full_pkgbase_list

	for REPO in $ALPINE_REPOS ; do

		schroot --run-session -c $SESSION --directory /var/lib/jenkins/aports/$REPO -- ap dump-json | \

			jq -r 'to_entries|.[]|"\(.key) \(.value.pkgver)-\(.value.pkgrel)"' | \

			jq -r 'to_entries|.[]|"\(.key) \(.value.pkgver)-r\(.value.pkgrel)"' | \

			while read pkgname version; do

				printf '%s %s %s\n' "$REPO" "$pkgname" "$version"

			done | sort -u -R >> "$ALPINE_PKGS"_full_pkgbase_list

bin/reproducible_build_alpine_pkg.sh

+2 −2
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ first_build() { 
	if [ -n "$epoch" ] ; then

		epoch="$epoch:"

	fi

	VERSION="$epoch$pkgver-$pkgrel"

	VERSION="$epoch$pkgver-r$pkgrel"

	echo $VERSION > $TMPDIR/b1/$SRCPACKAGE/build1.version

	# nicely run abuild with a timeout of $TIMEOUT hours

	timeout -k $TIMEOUT.1h ${TIMEOUT}h /usr/bin/ionice -c 3 /usr/bin/nice \
@@ -220,7 +220,7 @@ second_build() { 
	if [ -n "$epoch" ] ; then

		epoch="$epoch:"

	fi

	VERSION="$epoch$pkgver-$pkgrel"

	VERSION="$epoch$pkgver-r$pkgrel"

	echo $VERSION > $TMPDIR/b2/$SRCPACKAGE/build2.version

	# nicely run abuild with a timeout of $TIMEOUT hours

	timeout -k $TIMEOUT.1h ${TIMEOUT}h /usr/bin/ionice -c 3 /usr/bin/nice \