<p>osmith <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-trx/+/25312">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">d/patches/build-for-debian8.patch: remove<br><br>Remove this workaround, as we are not building for debian 8 anymore.<br><br>Related: OS#5223<br>Depends: osmo-ci Ibe7ba124557969df62798ba49c4489e9606c2341<br>Change-Id: I5519075a7f95fa61b0b5f1825e4e9324b9eede76<br>---<br>M contrib/jenkins.sh<br>D debian/patches/build-for-debian8.patch<br>D debian/patches/series<br>3 files changed, 0 insertions(+), 66 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh</span><br><span>index 3cf12c6..bcdcca4 100755</span><br><span>--- a/contrib/jenkins.sh</span><br><span>+++ b/contrib/jenkins.sh</span><br><span>@@ -115,9 +115,4 @@</span><br><span> </span><br><span> $MAKE $PARALLEL_MAKE maintainer-clean</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-# Verify distro-specific package patches apply:</span><br><span style="color: hsl(0, 100%, 40%);">-for patch in debian/patches/*.patch; do</span><br><span style="color: hsl(0, 100%, 40%);">- patch --dry-run -p1 < "$patch"</span><br><span style="color: hsl(0, 100%, 40%);">-done</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> osmo-clean-workspace.sh</span><br><span>diff --git a/debian/patches/build-for-debian8.patch b/debian/patches/build-for-debian8.patch</span><br><span>deleted file mode 100644</span><br><span>index 074dca9..0000000</span><br><span>--- a/debian/patches/build-for-debian8.patch</span><br><span>+++ /dev/null</span><br><span>@@ -1,60 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-diff --git a/debian/control b/debian/control</span><br><span style="color: hsl(0, 100%, 40%);">-index 12d9af5..27b9d60 100644</span><br><span>---- a/debian/control</span><br><span style="color: hsl(0, 100%, 40%);">-+++ b/debian/control</span><br><span style="color: hsl(0, 100%, 40%);">-@@ -13,7 +13,6 @@ Build-Depends: debhelper (>= 9),</span><br><span style="color: hsl(0, 100%, 40%);">- libfftw3-dev,</span><br><span style="color: hsl(0, 100%, 40%);">- libtalloc-dev,</span><br><span style="color: hsl(0, 100%, 40%);">- libusrp-dev,</span><br><span style="color: hsl(0, 100%, 40%);">-- liblimesuite-dev,</span><br><span style="color: hsl(0, 100%, 40%);">- libosmocore-dev (>= 1.5.0),</span><br><span style="color: hsl(0, 100%, 40%);">- osmo-gsm-manuals-dev</span><br><span style="color: hsl(0, 100%, 40%);">- Standards-Version: 3.9.6</span><br><span style="color: hsl(0, 100%, 40%);">-@@ -30,7 +29,7 @@ Package: osmo-trx-dbg</span><br><span style="color: hsl(0, 100%, 40%);">- Architecture: any</span><br><span style="color: hsl(0, 100%, 40%);">- Section: debug</span><br><span style="color: hsl(0, 100%, 40%);">- Priority: extra</span><br><span style="color: hsl(0, 100%, 40%);">--Depends: osmo-trx-uhd (= ${binary:Version}), osmo-trx-usrp1 (= ${binary:Version}), osmo-trx-lms (= ${binary:Version}), osmo-trx-ipc (= ${binary:Version}), ${misc:Depends}</span><br><span style="color: hsl(0, 100%, 40%);">-+Depends: osmo-trx-uhd (= ${binary:Version}), osmo-trx-usrp1 (= ${binary:Version}), osmo-trx-ipc (= ${binary:Version}), ${misc:Depends}</span><br><span style="color: hsl(0, 100%, 40%);">- Description: Debug symbols for the osmo-trx-*</span><br><span style="color: hsl(0, 100%, 40%);">- Make debugging possible</span><br><span style="color: hsl(0, 100%, 40%);">- </span><br><span style="color: hsl(0, 100%, 40%);">-@@ -72,25 +71,6 @@ Description: SDR transceiver that implements Layer 1 of a GSM BTS (USRP1)</span><br><span style="color: hsl(0, 100%, 40%);">- between different telecommunication associations for developing new</span><br><span style="color: hsl(0, 100%, 40%);">- generations of mobile phone networks. (post-2G/GSM)</span><br><span style="color: hsl(0, 100%, 40%);">- </span><br><span style="color: hsl(0, 100%, 40%);">--Package: osmo-trx-lms</span><br><span style="color: hsl(0, 100%, 40%);">--Architecture: any</span><br><span style="color: hsl(0, 100%, 40%);">--Depends: ${shlibs:Depends}, ${misc:Depends}</span><br><span style="color: hsl(0, 100%, 40%);">--Description: SDR transceiver that implements Layer 1 of a GSM BTS (LimeSuite)</span><br><span style="color: hsl(0, 100%, 40%);">-- OsmoTRX is a software-defined radio transceiver that implements the Layer 1</span><br><span style="color: hsl(0, 100%, 40%);">-- physical layer of a BTS comprising the following 3GPP specifications:</span><br><span style="color: hsl(0, 100%, 40%);">-- .</span><br><span style="color: hsl(0, 100%, 40%);">-- TS 05.01 "Physical layer on the radio path"</span><br><span style="color: hsl(0, 100%, 40%);">-- TS 05.02 "Multiplexing and Multiple Access on the Radio Path"</span><br><span style="color: hsl(0, 100%, 40%);">-- TS 05.04 "Modulation"</span><br><span style="color: hsl(0, 100%, 40%);">-- TS 05.10 "Radio subsystem synchronization"</span><br><span style="color: hsl(0, 100%, 40%);">-- .</span><br><span style="color: hsl(0, 100%, 40%);">-- In this context, BTS is "Base transceiver station". It's the stations that</span><br><span style="color: hsl(0, 100%, 40%);">-- connect mobile phones to the mobile network.</span><br><span style="color: hsl(0, 100%, 40%);">-- .</span><br><span style="color: hsl(0, 100%, 40%);">-- 3GPP is the "3rd Generation Partnership Project" which is the collaboration</span><br><span style="color: hsl(0, 100%, 40%);">-- between different telecommunication associations for developing new</span><br><span style="color: hsl(0, 100%, 40%);">-- generations of mobile phone networks. (post-2G/GSM)</span><br><span style="color: hsl(0, 100%, 40%);">--</span><br><span style="color: hsl(0, 100%, 40%);">- Package: osmo-trx-ipc</span><br><span style="color: hsl(0, 100%, 40%);">- Architecture: any</span><br><span style="color: hsl(0, 100%, 40%);">- Depends: ${shlibs:Depends}, ${misc:Depends}</span><br><span style="color: hsl(0, 100%, 40%);">-diff --git a/debian/rules b/debian/rules</span><br><span style="color: hsl(0, 100%, 40%);">-index 5795643..5937c17 100755</span><br><span>---- a/debian/rules</span><br><span style="color: hsl(0, 100%, 40%);">-+++ b/debian/rules</span><br><span style="color: hsl(0, 100%, 40%);">-@@ -9,7 +9,7 @@ override_dh_shlibdeps:</span><br><span style="color: hsl(0, 100%, 40%);">- dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info</span><br><span style="color: hsl(0, 100%, 40%);">- </span><br><span style="color: hsl(0, 100%, 40%);">- override_dh_auto_configure:</span><br><span style="color: hsl(0, 100%, 40%);">-- dh_auto_configure -- --with-uhd --with-usrp1 --with-lms --with-ipc --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals</span><br><span style="color: hsl(0, 100%, 40%);">-+ dh_auto_configure -- --with-uhd --with-usrp1 --with-ipc --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals</span><br><span style="color: hsl(0, 100%, 40%);">- </span><br><span style="color: hsl(0, 100%, 40%);">- override_dh_strip:</span><br><span style="color: hsl(0, 100%, 40%);">- dh_strip --dbg-package=osmo-trx-dbg</span><br><span>diff --git a/debian/patches/series b/debian/patches/series</span><br><span>deleted file mode 100644</span><br><span>index 82063b7..0000000</span><br><span>--- a/debian/patches/series</span><br><span>+++ /dev/null</span><br><span>@@ -1 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-# build-for-debian8.patch</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-trx/+/25312">change 25312</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-trx/+/25312"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-trx </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I5519075a7f95fa61b0b5f1825e4e9324b9eede76 </div>
<div style="display:none"> Gerrit-Change-Number: 25312 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>