From 6a7ee08532e4c5e69a5ba8eb637e6448b76f346a Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Fri, 26 Jun 2015 09:39:36 +0200 Subject: [PATCH 1/4] Big Osmocom update to the latest code * Update libosmocore with GB fixes and endian.h work * Update libosmo-netif for rtp header changes * Update OpenGGSN that now has libosmocore logging * Update OpenBSC with many new features, subscriber queue rework and more --- conf/layer.conf | 2 +- recipes-osmocom/libosmo-abis/libosmo-abis_git.bb | 2 +- recipes-osmocom/libosmo-netif/libosmo-netif_git.bb | 2 +- recipes-osmocom/libosmocore/libosmocore_git.bb | 4 ++-- recipes-osmocom/openbsc/openbsc_git.bb | 3 ++- recipes-osmocom/openggsn/openggsn_git.bb | 4 +++- 6 files changed, 10 insertions(+), 7 deletions(-) diff --git a/conf/layer.conf b/conf/layer.conf index bfcd10c122..d67459b3e6 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 = "16" +META_TELEPHONY_OSMO_INC = "17" diff --git a/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb b/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb index c2dbd44b23..8ea0c0527d 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 = "2f0dd0c01930fbc0dbf0c86946dd0a429f3cd6e2" +SRCREV = "3a580f263a24e0ce7d3ed544af0373c22ae9eeac" SRC_URI = "git://git.osmocom.org/libosmo-abis.git;protocol=git" PV = "0.3.1+gitr${SRCPV}" PR = "${INC_PR}.1" diff --git a/recipes-osmocom/libosmo-netif/libosmo-netif_git.bb b/recipes-osmocom/libosmo-netif/libosmo-netif_git.bb index f82d7ba0c9..073f0abef8 100644 --- a/recipes-osmocom/libosmo-netif/libosmo-netif_git.bb +++ b/recipes-osmocom/libosmo-netif/libosmo-netif_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "603f6c40d55b87f81fbd8ff1ad7b9568f3b962ff" +SRCREV = "c55d867508c8ddb93a822c018b5ce5a9a72006aa" SRC_URI = "git://git.osmocom.org/libosmo-netif.git;protocol=git" PV = "0.4.0+gitr${SRCPV}" PR = "${INC_PR}.2" diff --git a/recipes-osmocom/libosmocore/libosmocore_git.bb b/recipes-osmocom/libosmocore/libosmocore_git.bb index 367fefb178..c22076ccfe 100644 --- a/recipes-osmocom/libosmocore/libosmocore_git.bb +++ b/recipes-osmocom/libosmocore/libosmocore_git.bb @@ -1,9 +1,9 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "f8699ca51eeb4f3d34336501abcaf071b4a95a47" +SRCREV = "c1cb75eff5b060da9e6d43521e4913a8bf4e74fc" SRC_URI = "git://git.osmocom.org/libosmocore.git;protocol=git" -PV = "0.8.0+gitr${SRCPV}" +PV = "0.8.1+gitr${SRCPV}" PR = "r2" PACKAGES =+ "libosmoctrl" diff --git a/recipes-osmocom/openbsc/openbsc_git.bb b/recipes-osmocom/openbsc/openbsc_git.bb index 611d2c78e4..920ba341bc 100644 --- a/recipes-osmocom/openbsc/openbsc_git.bb +++ b/recipes-osmocom/openbsc/openbsc_git.bb @@ -1,9 +1,10 @@ require ${PN}.inc PV = "0.14.0+gitr${SRCPV}" +PRINC = "0" PR = "${INC_PR}.6" -SRCREV = "66105fd3dc043e0f8011e1fa47864611936dd6aa" +SRCREV = "57ee78078905c7499bd4e6857f8981d22badfcac" SRC_URI += "git://git.osmocom.org/openbsc.git;protocol=git \ file://upgrade-mncc-version.patch" diff --git a/recipes-osmocom/openggsn/openggsn_git.bb b/recipes-osmocom/openggsn/openggsn_git.bb index e39f6681d1..5ac807fad5 100644 --- a/recipes-osmocom/openggsn/openggsn_git.bb +++ b/recipes-osmocom/openggsn/openggsn_git.bb @@ -4,13 +4,15 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" PV = "0.91+gitr${SRCPV}" PR = "r14" -SRCREV = "c190896437b332d3fa2093b3f489810b48e3c90c" +SRCREV = "b07d07072e70ac4f920be9dfdf45615193b4ec2d" SRC_URI = "git://git.osmocom.org/openggsn \ file://openggsn.init \ file://libgtp-queue_depth_32.patch \ " S = "${WORKDIR}/git" +DEPENDS = "libosmocore" + PACKAGES =+ " libgtp libgtp-dev libgtp-staticdev openggsn-sgsnemu" RDEPENDS_${PN} += "kernel-module-tun" From ce5e874f31cb4f041500caddb2833b3c0892c674 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Fri, 26 Jun 2015 09:59:25 +0200 Subject: [PATCH 2/4] libosmo-sccp: Update as well for new function used by OpenBSC --- recipes-osmocom/libosmo-sccp/libosmo-sccp_0.0.6.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-osmocom/libosmo-sccp/libosmo-sccp_0.0.6.1.bb b/recipes-osmocom/libosmo-sccp/libosmo-sccp_0.0.6.1.bb index 328a1709e1..7e8b92f83c 100644 --- a/recipes-osmocom/libosmo-sccp/libosmo-sccp_0.0.6.1.bb +++ b/recipes-osmocom/libosmo-sccp/libosmo-sccp_0.0.6.1.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "ef8fc3bf28634d361adeec5490f807efb0ab3341" +SRCREV = "2d2d885bd124b8ae2d3a04f3583a756029820dc0" SRC_URI = "git://git.osmocom.org/libosmo-sccp.git;protocol=git" PR = "${INC_PR}.1" From 210921f81dd8ec3bc2068ecbf47c03a6d5e51768 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Fri, 26 Jun 2015 10:19:50 +0200 Subject: [PATCH 3/4] c-ares: Import from meta-intel-iot-middleware Needed by OpenBSC http://git.yoctoproject.org/cgit/cgit.cgi/meta-intel-iot-middleware/plain/recipes-connectivity/c-ares/c-ares_1.10.0.bb --- recipes-misc/c-ares/c-ares_1.10.0.bb | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 recipes-misc/c-ares/c-ares_1.10.0.bb diff --git a/recipes-misc/c-ares/c-ares_1.10.0.bb b/recipes-misc/c-ares/c-ares_1.10.0.bb new file mode 100644 index 0000000000..0d1ef9d62b --- /dev/null +++ b/recipes-misc/c-ares/c-ares_1.10.0.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "C library for asynchronous DNS requests (including name resolves)" +HOMEPAGE = "http://c-ares.haxx.se/" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://README;beginline=17;endline=23;md5=d08205a43bc63c12cf394ac1d2cce7c3" + +PR = "r0" + +SRC_URI = "http://c-ares.haxx.se/download/c-ares-${PV}.tar.gz" + +SRC_URI[md5sum] = "1196067641411a75d3cbebe074fd36d8" +SRC_URI[sha256sum] = "3d701674615d1158e56a59aaede7891f2dde3da0f46a6d3c684e0ae70f52d3db" + +inherit autotools From 7b41ee80ec30db8d218ce900bf0df5d2333e42c1 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Fri, 26 Jun 2015 10:20:40 +0200 Subject: [PATCH 4/4] openbsc: Require c-ares for the SGSN now --- recipes-osmocom/openbsc/openbsc.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-osmocom/openbsc/openbsc.inc b/recipes-osmocom/openbsc/openbsc.inc index aa5f7a7e6e..b8eaca58cd 100644 --- a/recipes-osmocom/openbsc/openbsc.inc +++ b/recipes-osmocom/openbsc/openbsc.inc @@ -1,5 +1,5 @@ DESCRIPTION = "OpenBSC a Free Software GSM BaseStationController" -DEPENDS = "libdbi libosmocore libosmo-sccp libosmo-abis libosmo-netif openggsn libsmpp34 bcg729 libgsm libpcap" +DEPENDS = "libdbi libosmocore libosmo-sccp libosmo-abis libosmo-netif openggsn libsmpp34 bcg729 libgsm libpcap c-ares" HOMEPAGE = "http://openbsc.osmocom.org/" LICENSE = "AGPLv3+" LIC_FILES_CHKSUM = "file://COPYING;md5=73f1eb20517c55bf9493b7dd6e480788"