<p>daniel has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/meta-telephony/+/15223">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">libosmocore: Package osmo-config-merge<br><br>Related: rt#27399<br>Change-Id: Iefab4ac2c37591413d384edc860427dd8fc64c83<br>---<br>M recipes-osmocom/libosmocore/libosmocore_git.bb<br>1 file changed, 3 insertions(+), 2 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/23/15223/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/recipes-osmocom/libosmocore/libosmocore_git.bb b/recipes-osmocom/libosmocore/libosmocore_git.bb</span><br><span>index 3a417f0..f43f296 100644</span><br><span>--- a/recipes-osmocom/libosmocore/libosmocore_git.bb</span><br><span>+++ b/recipes-osmocom/libosmocore/libosmocore_git.bb</span><br><span>@@ -4,9 +4,9 @@</span><br><span> SRCREV = "c996d652f974f803653ce66d27d60675c1f77c2e"</span><br><span> SRC_URI = "git://git.osmocom.org/libosmocore.git;protocol=git;nobranch=1"</span><br><span> PV = "1.2.0+gitr${SRCPV}"</span><br><span style="color: hsl(0, 100%, 40%);">-PR = "${INC_PR}.0"</span><br><span style="color: hsl(120, 100%, 40%);">+PR = "${INC_PR}.1"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-PACKAGES =+ "libosmoctrl libosmocodec libosmogb libosmogsm libosmovty osmo-arfcn osmo-auc-gen"</span><br><span style="color: hsl(120, 100%, 40%);">+PACKAGES =+ "libosmoctrl libosmocodec libosmogb libosmogsm libosmovty osmo-arfcn osmo-auc-gen osmo-config-merge"</span><br><span> FILES_libosmoctrl = "${libdir}/libosmoctrl${SOLIBS}"</span><br><span> FILES_libosmocodec = "${libdir}/libosmocodec${SOLIBS}"</span><br><span> FILES_libosmogb = "${libdir}/libosmogb${SOLIBS}"</span><br><span>@@ -14,6 +14,7 @@</span><br><span> FILES_libosmovty = "${libdir}/libosmovty${SOLIBS}"</span><br><span> FILES_osmo-arfcn = "${bindir}/osmo-arfcn"</span><br><span> FILES_osmo-auc-gen = "${bindir}/osmo-auc-gen"</span><br><span style="color: hsl(120, 100%, 40%);">+FILES_osmo-config-merge = "${bindir}/osmo-config-merge"</span><br><span> </span><br><span> # Requires fix for upgrades</span><br><span> RREPLACES_libosmocore = "DONOTREPLACElibosmocore"</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/meta-telephony/+/15223">change 15223</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/+/15223"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: meta-telephony </div>
<div style="display:none"> Gerrit-Branch: 201705 </div>
<div style="display:none"> Gerrit-Change-Id: Iefab4ac2c37591413d384edc860427dd8fc64c83 </div>
<div style="display:none"> Gerrit-Change-Number: 15223 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: daniel <dwillmann@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>