<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/9345">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Pau Espin Pedrol: Looks good to me, approved; Verified

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">osmo-bsc: Don't try to package anything bsc-nat related<br><br>osmo-bsc_nat has been fully removed from osmo-bsc.git in<br>1c9b8b19176854ecf4a3d57e9eef6b495361557f.<br><br>Instead, build the one from openbsc.git.<br><br>Change-Id: I98109914d53cce1880f259f5d8d366879c2aff61<br>---<br>M recipes-osmocom/openbsc/openbsc.inc<br>M recipes-osmocom/osmo-bsc/osmo-bsc.inc<br>2 files changed, 11 insertions(+), 13 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/recipes-osmocom/openbsc/openbsc.inc b/recipes-osmocom/openbsc/openbsc.inc</span><br><span>index 36c57e7..9f23d52 100644</span><br><span>--- a/recipes-osmocom/openbsc/openbsc.inc</span><br><span>+++ b/recipes-osmocom/openbsc/openbsc.inc</span><br><span>@@ -11,9 +11,9 @@</span><br><span>           file://osmo-bsc-sccplite.service \</span><br><span>           "</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-INC_PR = "r0.${META_TELEPHONY_OSMO_INC}"</span><br><span style="color: hsl(120, 100%, 40%);">+INC_PR = "r1.${META_TELEPHONY_OSMO_INC}"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-EXTRA_OECONF += "--enable-osmo-bsc --enable-smpp --enable-mgcp-transcoding --with-g729"</span><br><span style="color: hsl(120, 100%, 40%);">+EXTRA_OECONF += "--enable-nat --enable-osmo-bsc --enable-smpp --enable-mgcp-transcoding --with-g729"</span><br><span> </span><br><span> inherit autotools update-rc.d pkgconfig</span><br><span> </span><br><span>@@ -21,6 +21,7 @@</span><br><span>      install -d ${D}${sysconfdir}/osmocom</span><br><span>         install -m 0660 ${S}/doc/examples/osmo-nitb/nanobts/openbsc.cfg ${D}${sysconfdir}/osmocom/osmo-nitb.cfg</span><br><span>      install -m 0660 ${S}/doc/examples/osmo-bsc-sccplite/osmo-bsc-sccplite.cfg ${D}${sysconfdir}/osmocom/osmo-bsc-sccplite.cfg</span><br><span style="color: hsl(120, 100%, 40%);">+     install -m 0644 ${S}/doc/examples/osmo-bsc_nat/osmo-bsc_nat.cfg ${D}${sysconfdir}/osmocom/</span><br><span> </span><br><span>       # Install sysv-init files</span><br><span>    install -d ${D}${sysconfdir}/init.d</span><br><span>@@ -37,7 +38,7 @@</span><br><span> </span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-PACKAGES =+ "osmo-bsc-sccplite osmo-nitb"</span><br><span style="color: hsl(120, 100%, 40%);">+PACKAGES =+ "osmo-bsc-nat osmo-bsc-sccplite osmo-nitb"</span><br><span> </span><br><span> INITSCRIPT_PACKAGES = "osmo-bsc-sccplite osmo-nitb"</span><br><span> </span><br><span>@@ -62,3 +63,9 @@</span><br><span>               ${sysconfdir}/osmocom/osmo-nitb.cfg \</span><br><span>                ${systemd_unitdir}/system/osmo-nitb.service \</span><br><span>                "</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+CONFFILES_osmo-bsc-nat = "${sysconfdir}/osmocom/osmo-bsc_nat.cfg"</span><br><span style="color: hsl(120, 100%, 40%);">+FILES_osmo-bsc-nat = " \</span><br><span style="color: hsl(120, 100%, 40%);">+               ${bindir}/osmo-bsc_nat \</span><br><span style="color: hsl(120, 100%, 40%);">+               ${sysconfdir}/osmocom/osmo-bsc_nat.cfg \</span><br><span style="color: hsl(120, 100%, 40%);">+               "</span><br><span>diff --git a/recipes-osmocom/osmo-bsc/osmo-bsc.inc b/recipes-osmocom/osmo-bsc/osmo-bsc.inc</span><br><span>index f20362f..d066a58 100644</span><br><span>--- a/recipes-osmocom/osmo-bsc/osmo-bsc.inc</span><br><span>+++ b/recipes-osmocom/osmo-bsc/osmo-bsc.inc</span><br><span>@@ -14,12 +14,11 @@</span><br><span>         install -d ${D}${sysconfdir}/osmocom/</span><br><span> </span><br><span>    install -m 0644 ${S}/doc/examples/osmo-bsc/osmo-bsc.cfg ${D}${sysconfdir}/osmocom/</span><br><span style="color: hsl(0, 100%, 40%);">-      install -m 0644 ${S}/doc/examples/osmo-bsc_nat/osmo-bsc_nat.cfg ${D}${sysconfdir}/osmocom/</span><br><span> </span><br><span>       install -m 0644 ${S}/contrib/systemd/osmo-bsc.service ${D}${systemd_system_unitdir}/</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-PACKAGES =+ "osmo-bsc-nat-doc osmo-bsc-nat meas-utils ipaccess-utils bs11-utils abisip-find"</span><br><span style="color: hsl(120, 100%, 40%);">+PACKAGES =+ "meas-utils ipaccess-utils bs11-utils abisip-find"</span><br><span> SYSTEMD_PACKAGES = "osmo-bsc"</span><br><span> SYSTEMD_SERVICE_osmo-bsc = "osmo-bsc.service"</span><br><span> </span><br><span>@@ -43,11 +42,3 @@</span><br><span>                 ${bindir}/osmo-meas-pcap2db \</span><br><span>                ${bindir}/meas_json \</span><br><span>                "</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-FILES_osmo-bsc-nat = " \</span><br><span style="color: hsl(0, 100%, 40%);">-             ${bindir}/osmo-bsc_nat \</span><br><span style="color: hsl(0, 100%, 40%);">-                ${sysconfdir}/osmocom/osmo-bsc_nat.cfg \</span><br><span style="color: hsl(0, 100%, 40%);">-                "</span><br><span style="color: hsl(0, 100%, 40%);">-CONFFILES_osmo-bsc-nat = "${sysconfdir}/osmocom/osmo-bsc_nat.cfg"</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-FILES_osmo-bsc-nat-doc = " ${docdir}/osmo-bsc/examples/osmo-bsc_nat "</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/9345">change 9345</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/9345"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: meta-telephony </div>
<div style="display:none"> Gerrit-Branch: laforge/nightly </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I98109914d53cce1880f259f5d8d366879c2aff61 </div>
<div style="display:none"> Gerrit-Change-Number: 9345 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>