libosmocore: Package osmo-config-merge

Related: rt#27399
Change-Id: Iefab4ac2c37591413d384edc860427dd8fc64c83
diff --git a/recipes-osmocom/libosmocore/libosmocore_git.bb b/recipes-osmocom/libosmocore/libosmocore_git.bb
index 3a417f0..f43f296 100644
--- a/recipes-osmocom/libosmocore/libosmocore_git.bb
+++ b/recipes-osmocom/libosmocore/libosmocore_git.bb
@@ -4,9 +4,9 @@
 SRCREV = "c996d652f974f803653ce66d27d60675c1f77c2e"
 SRC_URI = "git://git.osmocom.org/libosmocore.git;protocol=git;nobranch=1"
 PV = "1.2.0+gitr${SRCPV}"
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
 
-PACKAGES =+ "libosmoctrl libosmocodec libosmogb libosmogsm libosmovty osmo-arfcn osmo-auc-gen"
+PACKAGES =+ "libosmoctrl libosmocodec libosmogb libosmogsm libosmovty osmo-arfcn osmo-auc-gen osmo-config-merge"
 FILES_libosmoctrl = "${libdir}/libosmoctrl${SOLIBS}"
 FILES_libosmocodec = "${libdir}/libosmocodec${SOLIBS}"
 FILES_libosmogb = "${libdir}/libosmogb${SOLIBS}"
@@ -14,6 +14,7 @@
 FILES_libosmovty = "${libdir}/libosmovty${SOLIBS}"
 FILES_osmo-arfcn = "${bindir}/osmo-arfcn"
 FILES_osmo-auc-gen = "${bindir}/osmo-auc-gen"
+FILES_osmo-config-merge = "${bindir}/osmo-config-merge"
 
 # Requires fix for upgrades
 RREPLACES_libosmocore = "DONOTREPLACElibosmocore"