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

reproducible alpine: fix alpine version generation

Signed-off-by: Holger Levsen's avatarHolger Levsen <holger@layer-acht.org>
parent 9a094dae
......@@ -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
......
......@@ -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 \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment