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

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">osmo-sip-connector: handle systemd and cfg files through autotools<br><br>Change-Id: I88fa636fdc97dbd1c8d13358fb48d157bd95c805<br>---<br>M recipes-osmocom/osmo-sip-connector/osmo-sip-connector.inc<br>1 file changed, 5 insertions(+), 7 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/recipes-osmocom/osmo-sip-connector/osmo-sip-connector.inc b/recipes-osmocom/osmo-sip-connector/osmo-sip-connector.inc</span><br><span>index d7f22a3..96d3734 100644</span><br><span>--- a/recipes-osmocom/osmo-sip-connector/osmo-sip-connector.inc</span><br><span>+++ b/recipes-osmocom/osmo-sip-connector/osmo-sip-connector.inc</span><br><span>@@ -5,17 +5,15 @@</span><br><span> </span><br><span> DEPENDS = "sofia-sip libosmocore"</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> inherit autotools pkgconfig systemd</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-do_install_append() {</span><br><span style="color: hsl(0, 100%, 40%);">-        install -d ${D}${systemd_system_unitdir}/</span><br><span style="color: hsl(0, 100%, 40%);">-       install -d ${D}${sysconfdir}/osmocom/</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> </span><br><span style="color: hsl(0, 100%, 40%);">- install -m 0644 ${S}/doc/examples/osmo-sip-connector.cfg ${D}${sysconfdir}/osmocom/</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- install -m 0644 ${S}/contrib/systemd/osmo-sip-connector.service ${D}${systemd_system_unitdir}/</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span> SYSTEMD_SERVICE_${PN} = "${PN}.service"</span><br><span> CONFFILES_osmo-sip-connector = "${sysconfdir}/osmocom/osmo-sip-connector.cfg"</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10957">change 10957</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/10957"/><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: I88fa636fdc97dbd1c8d13358fb48d157bd95c805 </div>
<div style="display:none"> Gerrit-Change-Number: 10957 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </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>