<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ci/+/19452">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  laforge: Looks good to me, approved; Verified

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">nightly-packages: Hard-code LimeSuite to 20.01.0 as 20.07.0 is broken<br><br>See https://github.com/myriadrf/LimeSuite/issues/313<br><br>This also reverts the previous commits that removed the work-around for<br>building LimeSuite on Debian10, as that one is still required for<br>v20.01.0 (and not for v20.07.0).<br><br>Change-Id: Ib70418f0b8a4c6aafa3098b6fa3e240f89112b59<br>---<br>A obs-patches/limesuite/build-for-debian10.patch<br>M scripts/osmocom-latest-packages.sh<br>M scripts/osmocom-nightly-packages.sh<br>3 files changed, 28 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/obs-patches/limesuite/build-for-debian10.patch b/obs-patches/limesuite/build-for-debian10.patch</span><br><span>new file mode 100644</span><br><span>index 0000000..2387b08</span><br><span>--- /dev/null</span><br><span>+++ b/obs-patches/limesuite/build-for-debian10.patch</span><br><span>@@ -0,0 +1,13 @@</span><br><span style="color: hsl(120, 100%, 40%);">+diff --git a/debian/control b/debian/control</span><br><span style="color: hsl(120, 100%, 40%);">+index c25b7c97..375ab95b 100644</span><br><span style="color: hsl(120, 100%, 40%);">+--- a/debian/control</span><br><span>++++ b/debian/control</span><br><span style="color: hsl(120, 100%, 40%);">+@@ -6,7 +6,7 @@ Build-Depends:</span><br><span style="color: hsl(120, 100%, 40%);">+     debhelper (>= 9.0.0),</span><br><span style="color: hsl(120, 100%, 40%);">+     cmake (>= 3.1.3),</span><br><span style="color: hsl(120, 100%, 40%);">+     libusb-1.0-0-dev,</span><br><span style="color: hsl(120, 100%, 40%);">+-    libwxgtk3.0-dev,</span><br><span style="color: hsl(120, 100%, 40%);">++    libwxgtk3.0-gtk3-dev,</span><br><span style="color: hsl(120, 100%, 40%);">+     libsoapysdr-dev,</span><br><span style="color: hsl(120, 100%, 40%);">+     freeglut3-dev,</span><br><span style="color: hsl(120, 100%, 40%);">+     libfltk1.3-dev,</span><br><span>diff --git a/scripts/osmocom-latest-packages.sh b/scripts/osmocom-latest-packages.sh</span><br><span>index 212bb4c..219ae6d 100755</span><br><span>--- a/scripts/osmocom-latest-packages.sh</span><br><span>+++ b/scripts/osmocom-latest-packages.sh</span><br><span>@@ -30,6 +30,11 @@</span><br><span> </span><br><span> get_last_tag() {</span><br><span>   project="$1"</span><br><span style="color: hsl(120, 100%, 40%);">+  if [ "$project" = "limesuite" ]; then</span><br><span style="color: hsl(120, 100%, 40%);">+    # temp workaround, see https://github.com/myriadrf/LimeSuite/issues/313</span><br><span style="color: hsl(120, 100%, 40%);">+    echo "v20.01.0"</span><br><span style="color: hsl(120, 100%, 40%);">+    return</span><br><span style="color: hsl(120, 100%, 40%);">+  fi</span><br><span>   if [ "$project" = "limesuite" ] || [ "$project" = "open5gs" ]; then</span><br><span>     ver_regexp="^v[0-9]*.[0-9]*.[0-9]*$"</span><br><span>   else</span><br><span>diff --git a/scripts/osmocom-nightly-packages.sh b/scripts/osmocom-nightly-packages.sh</span><br><span>index ea0dcd4..876c70c 100755</span><br><span>--- a/scripts/osmocom-nightly-packages.sh</span><br><span>+++ b/scripts/osmocom-nightly-packages.sh</span><br><span>@@ -51,6 +51,11 @@</span><br><span> get_last_tag() {</span><br><span>   project="$1"</span><br><span>   if [ "$project" = "limesuite" ]; then</span><br><span style="color: hsl(120, 100%, 40%);">+    # temp workaround, see https://github.com/myriadrf/LimeSuite/issues/313</span><br><span style="color: hsl(120, 100%, 40%);">+    echo "v20.01.0"</span><br><span style="color: hsl(120, 100%, 40%);">+    return</span><br><span style="color: hsl(120, 100%, 40%);">+  fi</span><br><span style="color: hsl(120, 100%, 40%);">+  if [ "$project" = "limesuite" ]; then</span><br><span>     ver_regexp="^v[0-9]*.[0-9]*.[0-9]*$"</span><br><span>   else</span><br><span>     ver_regexp="^[0-9]*.[0-9]*.[0-9]*$"</span><br><span>@@ -179,7 +184,9 @@</span><br><span> checkout_limesuite() {</span><br><span>   cd "$REPO"</span><br><span>   git clone https://github.com/myriadrf/LimeSuite limesuite</span><br><span style="color: hsl(0, 100%, 40%);">-  TAG="$(get_last_tag limesuite)"</span><br><span style="color: hsl(120, 100%, 40%);">+  # temp workaround, see https://github.com/myriadrf/LimeSuite/issues/313</span><br><span style="color: hsl(120, 100%, 40%);">+  #TAG="$(get_last_tag limesuite)"</span><br><span style="color: hsl(120, 100%, 40%);">+  TAG="v20.01.0"</span><br><span>   cd limesuite</span><br><span>   git checkout "$TAG"</span><br><span> }</span><br><span>@@ -241,9 +248,11 @@</span><br><span>   cd "$REPO"</span><br><span>   osmo_obs_checkout_copy debian8 osmo-gsm-manuals</span><br><span>   osmo_obs_checkout_copy debian8 osmo-trx</span><br><span style="color: hsl(120, 100%, 40%);">+  osmo_obs_checkout_copy debian10 limesuite</span><br><span> </span><br><span>   build osmocom-$FEED</span><br><span>   build limesuite no_commit --git-upstream-tree="$(get_last_tag limesuite)"</span><br><span style="color: hsl(120, 100%, 40%);">+  build limesuite-debian10 no_commit --git-upstream-tree="$(get_last_tag limesuite)"</span><br><span>   build osmo-gsm-manuals</span><br><span>   build osmo-gsm-manuals-debian8</span><br><span>   build libosmocore</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ci/+/19452">change 19452</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-ci/+/19452"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-ci </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ib70418f0b8a4c6aafa3098b6fa3e240f89112b59 </div>
<div style="display:none"> Gerrit-Change-Number: 19452 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>