Change in osmo-ci[master]: osmocom-latest-packages: Fix libusrp and other non-osmocom builds

[Harald Welte]

Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/10399


Change subject: osmocom-latest-packages: Fix libusrp and other non-osmocom builds
......................................................................

osmocom-latest-packages: Fix libusrp and other non-osmocom builds

We're using the build() function not only to build osmocom projects
requiring a .tarball-version file, but also other projects such as
libusrp.  Let's make the related git-buildpackage arguments conditional
to whether or not a .tarball-version file exists at all.

Change-Id: I0683cff036a240b1b819f91fbd230d5f9211074c
---
M scripts/osmocom-latest-packages.sh
1 file changed, 9 insertions(+), 4 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/99/10399/1

diff --git a/scripts/osmocom-latest-packages.sh b/scripts/osmocom-latest-packages.sh
index 1d122aa..83ab084 100755
--- a/scripts/osmocom-latest-packages.sh
+++ b/scripts/osmocom-latest-packages.sh
@@ -34,10 +34,15 @@
   git fetch
   VER=$(git tag -l --sort=v:refname | grep "^[0-9]*.[0-9]*.[0-9]*$" | tail -n 1)
   git checkout -f -B "$VER" "refs/tags/$VER"
-  test -x ./git-version-gen && ./git-version-gen . > .tarball-version 2>/dev/null
-  gbp buildpackage -d -S -uc -us "--git-export-dir=$output" "--git-debian-branch=$VER" \
-		   --git-ignore-new \
-		   --git-postexport='cp $GBP_GIT_DIR/../.tarball-version $GBP_TMP_DIR/'
+  if [ -x ./git-version-gen ]; then
+    ./git-version-gen . > .tarball-version 2>/dev/null
+    gbp buildpackage -S -uc -us -d --git-ignore-branch "--git-export-dir=$output" \
+		     "--git-debian-branch=$VER" --git-ignore-new \
+		     --git-postexport='cp $GBP_GIT_DIR/../.tarball-version $GBP_TMP_DIR/'
+  else
+    gbp buildpackage -S -uc -us -d --git-ignore-branch "--git-export-dir=$output" \
+		     "--git-debian-branch=$VER" --git-ignore-new
+  fi
 
   if [ ! -d "$TOP/$PROJ/$1" ] ; then
     # creating a new package is different from using old ones

-- 
To view, visit https://gerrit.osmocom.org/10399
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0683cff036a240b1b819f91fbd230d5f9211074c
Gerrit-Change-Number: 10399
Gerrit-PatchSet: 1
Gerrit-Owner: Harald Welte <laforge at gnumonks.org>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20180808/1ab3c0ff/attachment.htm>