diff options
| author | Harald Welte <laforge@gnumonks.org> | 2018-08-06 17:00:55 +0200 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2018-08-06 17:47:21 +0200 |
| commit | 447521ba8bfb19e11783972c7e134f6964372bfb (patch) | |
| tree | 8c4a6c4eedeb7a24e2e1328bf8b6bd167b308dea | |
| parent | 4e3c888398d4c8509686e1e2e39d88a856e74542 (diff) | |
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
| -rwxr-xr-x | scripts/osmocom-nightly-packages.sh | 13 |
1 files changed, 8 insertions, 5 deletions
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 @@ build() { 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 @@ checkout_limesuite() { git clone https://github.com/myriadrf/LimeSuite limesuite cd limesuite git checkout "$TAG" - touch .tarball-version } build_osmocom() { |