osmith submitted this change.

View Change


Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified
scripts/tarballs: gapk > v1.0: use make dist-bzip2

Use autotools logic to build tarballs for gapk above version v1.0.

Related: OS#6227
Change-Id: If9a04b458553e311cf8b891b204244db2b1ae2d8
---
M scripts/tarballs/prefer-configure.sh
1 file changed, 28 insertions(+), 7 deletions(-)

diff --git a/scripts/tarballs/prefer-configure.sh b/scripts/tarballs/prefer-configure.sh
index f9f8613..295b239 100755
--- a/scripts/tarballs/prefer-configure.sh
+++ b/scripts/tarballs/prefer-configure.sh
@@ -11,13 +11,22 @@

case "$PROJECT" in
gapk)
- # Running gapk's configure involves running libgsmhr/fetch_sources.py,
- # which according to git log doesn't really work unless using the
- # version from master and it looks like we don't want to distribute
- # these sources directly... or else we should just add them to the git
- # repository and not rely on downloading a remote archive that may just
- # change at any time. So create a simple git archive instead.
- exit 1
+ case "$TAG" in
+ v0.*|v1.0)
+ # Running gapk's configure involves running libgsmhr/fetch_sources.py,
+ # which according to git log doesn't really work unless using the
+ # version from master and it looks like we don't want to distribute
+ # these sources directly... or else we should just add them to the git
+ # repository and not rely on downloading a remote archive that may just
+ # change at any time. So create a simple git archive instead.
+ exit 1
+ ;;
+ *)
+ # Fixed above v1.0
+ # https://gerrit.osmocom.org/c/gapk/+/34892/1
+ exit 0
+ ;;
+ esac
;;
*)
exit 0

To view, visit change 34901. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: If9a04b458553e311cf8b891b204244db2b1ae2d8
Gerrit-Change-Number: 34901
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith@sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de>
Gerrit-Reviewer: osmith <osmith@sysmocom.de>
Gerrit-Reviewer: pespin <pespin@sysmocom.de>
Gerrit-MessageType: merged