summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Welte <laforge@osmocom.org>2020-08-05 10:19:09 +0200
committerHarald Welte <laforge@osmocom.org>2020-08-05 11:48:25 +0200
commit1d5d879be0abacd512e6f7c45e695044a75ddbd8 (patch)
tree2d76c3aa36f9891dc134597dbefe2093cae23150
parent523aa0874e2488af0dfee7090989c0280bf81581 (diff)
Revert "nightly-packages: Hard-code LimeSuite to 20.01.0 as 20.07.0 is broken"
This reverts commit e17a4d66d06ad5acb74a728ca378ad0cc9fffdf0, i.e. we are back to building the latest tag, now that v20.07.1 has been released, which actually builds again. However, the package name in debian/changelog has not been updated to reflect that version change, resulting in v20.07.1 being packaged in a package called v20.07.0. Change-Id: I01b77f03924a0b303103fb737dfee15b9c4b0c9c
-rw-r--r--obs-patches/limesuite/build-for-debian10.patch13
-rwxr-xr-xscripts/osmocom-latest-packages.sh5
-rwxr-xr-xscripts/osmocom-nightly-packages.sh11
3 files changed, 1 insertions, 28 deletions
diff --git a/obs-patches/limesuite/build-for-debian10.patch b/obs-patches/limesuite/build-for-debian10.patch
deleted file mode 100644
index 2387b08..0000000
--- a/obs-patches/limesuite/build-for-debian10.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/debian/control b/debian/control
-index c25b7c97..375ab95b 100644
---- a/debian/control
-+++ b/debian/control
-@@ -6,7 +6,7 @@ Build-Depends:
- debhelper (>= 9.0.0),
- cmake (>= 3.1.3),
- libusb-1.0-0-dev,
-- libwxgtk3.0-dev,
-+ libwxgtk3.0-gtk3-dev,
- libsoapysdr-dev,
- freeglut3-dev,
- libfltk1.3-dev,
diff --git a/scripts/osmocom-latest-packages.sh b/scripts/osmocom-latest-packages.sh
index 219ae6d..212bb4c 100755
--- a/scripts/osmocom-latest-packages.sh
+++ b/scripts/osmocom-latest-packages.sh
@@ -30,11 +30,6 @@ prepare() {
get_last_tag() {
project="$1"
- if [ "$project" = "limesuite" ]; then
- # temp workaround, see https://github.com/myriadrf/LimeSuite/issues/313
- echo "v20.01.0"
- return
- fi
if [ "$project" = "limesuite" ] || [ "$project" = "open5gs" ]; then
ver_regexp="^v[0-9]*.[0-9]*.[0-9]*$"
else
diff --git a/scripts/osmocom-nightly-packages.sh b/scripts/osmocom-nightly-packages.sh
index 876c70c..ea0dcd4 100755
--- a/scripts/osmocom-nightly-packages.sh
+++ b/scripts/osmocom-nightly-packages.sh
@@ -51,11 +51,6 @@ prepare() {
get_last_tag() {
project="$1"
if [ "$project" = "limesuite" ]; then
- # temp workaround, see https://github.com/myriadrf/LimeSuite/issues/313
- echo "v20.01.0"
- return
- fi
- if [ "$project" = "limesuite" ]; then
ver_regexp="^v[0-9]*.[0-9]*.[0-9]*$"
else
ver_regexp="^[0-9]*.[0-9]*.[0-9]*$"
@@ -184,9 +179,7 @@ download_bumpversion() {
checkout_limesuite() {
cd "$REPO"
git clone https://github.com/myriadrf/LimeSuite limesuite
- # temp workaround, see https://github.com/myriadrf/LimeSuite/issues/313
- #TAG="$(get_last_tag limesuite)"
- TAG="v20.01.0"
+ TAG="$(get_last_tag limesuite)"
cd limesuite
git checkout "$TAG"
}
@@ -248,11 +241,9 @@ build_osmocom() {
cd "$REPO"
osmo_obs_checkout_copy debian8 osmo-gsm-manuals
osmo_obs_checkout_copy debian8 osmo-trx
- osmo_obs_checkout_copy debian10 limesuite
build osmocom-$FEED
build limesuite no_commit --git-upstream-tree="$(get_last_tag limesuite)"
- build limesuite-debian10 no_commit --git-upstream-tree="$(get_last_tag limesuite)"
build osmo-gsm-manuals
build osmo-gsm-manuals-debian8
build libosmocore