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

[Harald Welte]

Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10358 )

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

osmocom-nightly-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: I0312a6671e739b803beb583769e4dfc6f44fa091
---
M scripts/osmocom-nightly-packages.sh
1 file changed, 8 insertions(+), 5 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved; Verified



diff --git a/scripts/osmocom-nightly-packages.sh b/scripts/osmocom-nightly-packages.sh
index 068c3fa..f2bf9b1 100755
--- a/scripts/osmocom-nightly-packages.sh
+++ b/scripts/osmocom-nightly-packages.sh
@@ -89,10 +89,14 @@
 
   mkdir -p "$DATA/$name"
   # source code build without dependency checks and unsigned source and unsigned change log
-  gbp buildpackage -S -uc -us -d --git-ignore-branch "--git-export-dir=$DATA/$name" \
-		   --git-ignore-new \
-		   --git-postexport='cp $GBP_GIT_DIR/../.tarball-version $GBP_TMP_DIR/' \
-		   $gitbpargs
+  if [ -f .tarball-version ]; then
+    gbp buildpackage -S -uc -us -d --git-ignore-branch "--git-export-dir=$DATA/$name" \
+		     --git-ignore-new $gitbpargs \
+		     --git-postexport='cp $GBP_GIT_DIR/../.tarball-version $GBP_TMP_DIR/'
+  else
+    gbp buildpackage -S -uc -us -d --git-ignore-branch "--git-export-dir=$DATA/$name" \
+		     --git-ignore-new $gitbpargs
+  fi
 
   mv "$DATA/$name/"*.tar* "$DATA/$name/"*.dsc "$oscdir/"
 
@@ -128,7 +132,6 @@
   git clone https://github.com/myriadrf/LimeSuite limesuite
   cd limesuite
   git checkout "$TAG"
-  touch .tarball-version
 }
 
 build_osmocom() {

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

Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I0312a6671e739b803beb583769e4dfc6f44fa091
Gerrit-Change-Number: 10358
Gerrit-PatchSet: 1
Gerrit-Owner: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20180806/2832d081/attachment.htm>