From d9a5b19a0a420270b31c5f90afc6ede38340ab29 Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <holger@moiji-mobile.com>
Date: Mon, 25 Aug 2014 08:19:02 +0200
Subject: [PATCH] libosmocore/libosmo-abis/openbsc: Move control interface
 around

The control interface has been moved to libosmocore and a new
library has been created for it. The ipaccess code has moved
from libosmo-abis to libosmocore and new defines for the VTY
and CTRL ports are now available inside libosmocore
---
 conf/layer.conf                                  |  2 +-
 recipes-osmocom/libosmo-abis/libosmo-abis_git.bb |  2 +-
 recipes-osmocom/libosmocore/libosmocore_git.bb   | 10 +++++++---
 recipes-osmocom/openbsc/openbsc_git.bb           |  2 +-
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/conf/layer.conf b/conf/layer.conf
index b143ff16d7..2a7f7a58be 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -9,4 +9,4 @@ BBFILE_COLLECTIONS += "telephony"
 BBFILE_PATTERN_telephony = "^${LAYERDIR}/"
 BBFILE_PRIORITY_telephony = "5"
 
-META_TELEPHONY_OSMO_INC = "12"
+META_TELEPHONY_OSMO_INC = "13"
diff --git a/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb b/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb
index cd398930e0..32d40e3a08 100644
--- a/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb
+++ b/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb
@@ -1,7 +1,7 @@
 require ${PN}.inc
 
 S = "${WORKDIR}/git"
-SRCREV = "ecd0a36ce8d468985ec296214e3ecced8da487cc"
+SRCREV = "c9295ea2dd1f52931f8670e706a7b0d4b3ac536b"
 SRC_URI = "git://git.osmocom.org/libosmo-abis.git;protocol=git"
 PV = "0.2.0+gitr${SRCPV}"
 PR = "${INC_PR}.2"
diff --git a/recipes-osmocom/libosmocore/libosmocore_git.bb b/recipes-osmocom/libosmocore/libosmocore_git.bb
index a5b695a556..ae3e300337 100644
--- a/recipes-osmocom/libosmocore/libosmocore_git.bb
+++ b/recipes-osmocom/libosmocore/libosmocore_git.bb
@@ -1,7 +1,11 @@
 require ${PN}.inc
 
 S = "${WORKDIR}/git"
-SRCREV = "0c50b17a2636a4a9d471ebbaf2cdb9396390e4cd"
+SRCREV = "276ca4b1722df573f9af7735820712bcaf32b800"
 SRC_URI = "git://git.osmocom.org/libosmocore.git;protocol=git"
-PV = "0.6.6+gitr${SRCPV}"
-PR = "r0"
+PV = "0.7.0+gitr${SRCPV}"
+PR = "r2"
+
+PACKAGES =+ "libosmoctrl"
+
+FILES_libosmoctrl = "${libdir}/libosmoctrl${SOLIBS}"
diff --git a/recipes-osmocom/openbsc/openbsc_git.bb b/recipes-osmocom/openbsc/openbsc_git.bb
index 39f57137bc..66c4605b02 100644
--- a/recipes-osmocom/openbsc/openbsc_git.bb
+++ b/recipes-osmocom/openbsc/openbsc_git.bb
@@ -3,7 +3,7 @@ require ${PN}.inc
 PV = "0.13.0+gitr${SRCPV}"
 PR = "${INC_PR}.5"
 
-SRCREV = "421365eeaa104a9781214f9e12c55023c1099bf8"
+SRCREV = "5160996d4a24fdb9faf0317c489689b5c31eebee"
 SRC_URI += "git://git.osmocom.org/openbsc.git;protocol=git \
     file://upgrade-mncc-version.patch \
     file://0001-systemd-Add-Install-section-to-service-files.patch"