<p>osmith has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/meta-telephony/+/22791">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Adjust to osmo-gbproxy split from osmo-sgsn<br><br>Related: OS#4992<br>Change-Id: I146d2a3600232a8b9eed05d0c3674d2416befd29<br>---<br>A recipes-osmocom/osmo-gbproxy/osmo-gbproxy.inc<br>A recipes-osmocom/osmo-gbproxy/osmo-gbproxy_git.bb<br>M recipes-osmocom/osmo-sgsn/osmo-sgsn.inc<br>3 files changed, 28 insertions(+), 10 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/91/22791/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/recipes-osmocom/osmo-gbproxy/osmo-gbproxy.inc b/recipes-osmocom/osmo-gbproxy/osmo-gbproxy.inc</span><br><span>new file mode 100644</span><br><span>index 0000000..39071c3</span><br><span>--- /dev/null</span><br><span>+++ b/recipes-osmocom/osmo-gbproxy/osmo-gbproxy.inc</span><br><span>@@ -0,0 +1,19 @@</span><br><span style="color: hsl(120, 100%, 40%);">+DESCRIPTION = "Osmocom's Gb interface aggregation/conversion proxy"</span><br><span style="color: hsl(120, 100%, 40%);">+HOMEPAGE = "https://osmocom.org/projects/osmo-gbproxy"</span><br><span style="color: hsl(120, 100%, 40%);">+LICENSE = "AGPLv3"</span><br><span style="color: hsl(120, 100%, 40%);">+LIC_FILES_CHKSUM = "file://COPYING;md5=73f1eb20517c55bf9493b7dd6e480788"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+DEPENDS = "c-ares libosmocore"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+INC_PR="r1.${META_TELEPHONY_OSMO_INC}"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+inherit autotools pkgconfig systemd</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+PACKAGECONFIG ??= "\</span><br><span style="color: hsl(120, 100%, 40%);">+ ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \</span><br><span style="color: hsl(120, 100%, 40%);">+ "</span><br><span style="color: hsl(120, 100%, 40%);">+PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir},--without-systemdsystemunitdir"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+SYSTEMD_SERVICE_osmo-gbproxy = "osmo-gbproxy.service"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+CONFFILES_osmo-gbproxy = "${sysconfdir}/osmocom/osmo-gbproxy.cfg"</span><br><span>diff --git a/recipes-osmocom/osmo-gbproxy/osmo-gbproxy_git.bb b/recipes-osmocom/osmo-gbproxy/osmo-gbproxy_git.bb</span><br><span>new file mode 100644</span><br><span>index 0000000..12bf4ed</span><br><span>--- /dev/null</span><br><span>+++ b/recipes-osmocom/osmo-gbproxy/osmo-gbproxy_git.bb</span><br><span>@@ -0,0 +1,7 @@</span><br><span style="color: hsl(120, 100%, 40%);">+require ${PN}.inc</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+S = "${WORKDIR}/git"</span><br><span style="color: hsl(120, 100%, 40%);">+SRCREV = "${AUTOREV}"</span><br><span style="color: hsl(120, 100%, 40%);">+SRC_URI = "git://git.osmocom.org/osmo-gbproxy.git;protocol=git"</span><br><span style="color: hsl(120, 100%, 40%);">+PV = "0.0.1+gitr${SRCPV}"</span><br><span style="color: hsl(120, 100%, 40%);">+PR = "${INC_PR}.0"</span><br><span>diff --git a/recipes-osmocom/osmo-sgsn/osmo-sgsn.inc b/recipes-osmocom/osmo-sgsn/osmo-sgsn.inc</span><br><span>index 57ab845..1f6fd7a 100644</span><br><span>--- a/recipes-osmocom/osmo-sgsn/osmo-sgsn.inc</span><br><span>+++ b/recipes-osmocom/osmo-sgsn/osmo-sgsn.inc</span><br><span>@@ -16,25 +16,17 @@</span><br><span> PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir},--without-systemdsystemunitdir"</span><br><span> PACKAGECONFIG[iu] = "--enable-iu,--disable-iu,libasn1c libosmo-sccp osmo-iuh,"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-PACKAGES =+ "osmo-gbproxy-doc osmo-gtphub-doc osmo-gbproxy osmo-gtphub"</span><br><span style="color: hsl(0, 100%, 40%);">-SYSTEMD_PACKAGES = "osmo-sgsn osmo-gbproxy osmo-gtphub"</span><br><span style="color: hsl(120, 100%, 40%);">+PACKAGES =+ "osmo-gtphub-doc osmo-gtphub"</span><br><span style="color: hsl(120, 100%, 40%);">+SYSTEMD_PACKAGES = "osmo-sgsn osmo-gtphub"</span><br><span> SYSTEMD_SERVICE_osmo-sgsn = "osmo-sgsn.service"</span><br><span style="color: hsl(0, 100%, 40%);">-SYSTEMD_SERVICE_osmo-gbproxy = "osmo-gbproxy.service"</span><br><span> SYSTEMD_SERVICE_osmo-gtphub = "osmo-gtphub.service"</span><br><span> </span><br><span> CONFFILES_osmo-sgsn = "${sysconfdir}/osmocom/osmo-sgsn.cfg"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-FILES_osmo-gbproxy = " \</span><br><span style="color: hsl(0, 100%, 40%);">- ${bindir}/osmo-gbproxy \</span><br><span style="color: hsl(0, 100%, 40%);">- ${sysconfdir}/osmocom/osmo-gbproxy.cfg \</span><br><span style="color: hsl(0, 100%, 40%);">- "</span><br><span style="color: hsl(0, 100%, 40%);">-CONFFILES_osmo-gbproxy = "${sysconfdir}/osmocom/osmo-gbproxy.cfg"</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> FILES_osmo-gtphub = " \</span><br><span> ${bindir}/osmo-gtphub \</span><br><span> ${sysconfdir}/osmocom/osmo-gtphub.cfg \</span><br><span> "</span><br><span> CONFFILES_osmo-gtphub = "${sysconfdir}/osmocom/osmo-gtphub.cfg"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-FILES_osmo-gbproxy-doc = " ${docdir}/osmo-sgsn/examples/osmo-gbproxy "</span><br><span> FILES_osmo-gtphub-doc = " ${docdir}/osmo-sgsn/examples/osmo-gtphub "</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/meta-telephony/+/22791">change 22791</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/meta-telephony/+/22791"/><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-Change-Id: I146d2a3600232a8b9eed05d0c3674d2416befd29 </div>
<div style="display:none"> Gerrit-Change-Number: 22791 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>