Change in osmo-ci[master]: nightly-packages: Hard-code LimeSuite to 20.01.0 as 20.07.0 is broken

[laforge]

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/19452 )

Change subject: nightly-packages: Hard-code LimeSuite to 20.01.0 as 20.07.0 is broken
......................................................................

nightly-packages: Hard-code LimeSuite to 20.01.0 as 20.07.0 is broken

See https://github.com/myriadrf/LimeSuite/issues/313

This also reverts the previous commits that removed the work-around for
building LimeSuite on Debian10, as that one is still required for
v20.01.0 (and not for v20.07.0).

Change-Id: Ib70418f0b8a4c6aafa3098b6fa3e240f89112b59
---
A obs-patches/limesuite/build-for-debian10.patch
M scripts/osmocom-latest-packages.sh
M scripts/osmocom-nightly-packages.sh
3 files changed, 28 insertions(+), 1 deletion(-)

Approvals:
  laforge: Looks good to me, approved; Verified



diff --git a/obs-patches/limesuite/build-for-debian10.patch b/obs-patches/limesuite/build-for-debian10.patch
new file mode 100644
index 0000000..2387b08
--- /dev/null
+++ b/obs-patches/limesuite/build-for-debian10.patch
@@ -0,0 +1,13 @@
+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 212bb4c..219ae6d 100755
--- a/scripts/osmocom-latest-packages.sh
+++ b/scripts/osmocom-latest-packages.sh
@@ -30,6 +30,11 @@
 
 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 ea0dcd4..876c70c 100755
--- a/scripts/osmocom-nightly-packages.sh
+++ b/scripts/osmocom-nightly-packages.sh
@@ -51,6 +51,11 @@
 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]*$"
@@ -179,7 +184,9 @@
 checkout_limesuite() {
   cd "$REPO"
   git clone https://github.com/myriadrf/LimeSuite limesuite
-  TAG="$(get_last_tag limesuite)"
+  # temp workaround, see https://github.com/myriadrf/LimeSuite/issues/313
+  #TAG="$(get_last_tag limesuite)"
+  TAG="v20.01.0"
   cd limesuite
   git checkout "$TAG"
 }
@@ -241,9 +248,11 @@
   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

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/19452
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: Ib70418f0b8a4c6aafa3098b6fa3e240f89112b59
Gerrit-Change-Number: 19452
Gerrit-PatchSet: 2
Gerrit-Owner: laforge <laforge at osmocom.org>
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200730/a13b997d/attachment.htm>