From 73295758f984ce59a68f1d7ad620ef96fd192bf7 Mon Sep 17 00:00:00 2001
From: Harald Welte <hwelte@sysmocom.de>
Date: Tue, 7 Aug 2012 17:33:33 +0200
Subject: [PATCH 01/10] libosmocore: update to more recent version including a
 BSSGP fix

---
 recipes-osmocom/libosmocore/libosmocore_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-osmocom/libosmocore/libosmocore_git.bb b/recipes-osmocom/libosmocore/libosmocore_git.bb
index ccc6999d8c..9ed5a16a63 100644
--- a/recipes-osmocom/libosmocore/libosmocore_git.bb
+++ b/recipes-osmocom/libosmocore/libosmocore_git.bb
@@ -1,7 +1,7 @@
 require ${PN}.inc
 
 S = "${WORKDIR}/git"
-SRCREV = "c5f055f9e5aa58548b484345bd3bdc914e640d6c"
+SRCREV = "aa5d0e88944fe3258260aedfbce9101301e35b44"
 SRC_URI = "git://git.osmocom.org/libosmocore.git;protocol=git"
 PV = "0.5.2+gitr${SRCPV}"
 PR = "0"

From 8479f83f3974eeb199607111af38ca2db7a07a20 Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <zecke@selfish.org>
Date: Wed, 15 Aug 2012 16:26:29 +0200
Subject: [PATCH 02/10] libosmocore: Introduce 0.5.3 and bump the
 META_TELEPHONY_OSMO_INC

META_TELEPHONY_OSMO_INC functions as kind of a reverse dependency,
packages using libosmocore will now rebuild and link to the newer
soversion of the libraries. Upgrade OpenBSC due an ABI change in
the GPRS/GB code.
---
 conf/layer.conf                                  |  2 +-
 recipes-osmocom/libosmocore/libosmocore_0.5.3.bb | 11 +++++++++++
 recipes-osmocom/openbsc/openbsc_git.bb           |  4 ++--
 3 files changed, 14 insertions(+), 3 deletions(-)
 create mode 100644 recipes-osmocom/libosmocore/libosmocore_0.5.3.bb

diff --git a/conf/layer.conf b/conf/layer.conf
index 0ddda0d069..f428ace73a 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 = "4"
+META_TELEPHONY_OSMO_INC = "5"
diff --git a/recipes-osmocom/libosmocore/libosmocore_0.5.3.bb b/recipes-osmocom/libosmocore/libosmocore_0.5.3.bb
new file mode 100644
index 0000000000..d7b84d8de2
--- /dev/null
+++ b/recipes-osmocom/libosmocore/libosmocore_0.5.3.bb
@@ -0,0 +1,11 @@
+require ${PN}.inc
+
+S = "${WORKDIR}/git"
+SRCREV = "335aedabf204ac025a79801c15c8488d35cc9981"
+SRC_URI = "git://git.osmocom.org/libosmocore.git;protocol=git"
+PR = "${INC_PR}.0"
+
+# because "${WORKDIR}/git" is not a git repo, it can't figure out the version
+do_configure_prepend() {
+    echo "${PV}" > ${S}/.tarball-version
+}
diff --git a/recipes-osmocom/openbsc/openbsc_git.bb b/recipes-osmocom/openbsc/openbsc_git.bb
index e661f9ca0e..7b20795539 100644
--- a/recipes-osmocom/openbsc/openbsc_git.bb
+++ b/recipes-osmocom/openbsc/openbsc_git.bb
@@ -1,9 +1,9 @@
 require ${PN}.inc
 
 PV = "0.12.0+gitr${SRCPV}"
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.2"
 
-SRCREV = "019f913ca383bda9256e273c06327041b1761330"
+SRCREV = "df49a983e2523b94bb62fec3076259355fe0b52b"
 SRC_URI += "git://git.osmocom.org/openbsc.git;protocol=git"
 
 S = "${WORKDIR}/git/openbsc"

From f88c9a6fbd1f32b7dfb27d2499b9f45dff596c74 Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <zecke@selfish.org>
Date: Wed, 15 Aug 2012 17:09:28 +0200
Subject: [PATCH 03/10] libosmocore: Build a 0.5.3+ version and force rebuild

The behavior of the OSMO_MIN/OSMO_MAX has been fixed. Update
the library and force the rebuild.
---
 conf/layer.conf                                | 2 +-
 recipes-osmocom/libosmocore/libosmocore_git.bb | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/conf/layer.conf b/conf/layer.conf
index f428ace73a..11f708973a 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 = "5"
+META_TELEPHONY_OSMO_INC = "6"
diff --git a/recipes-osmocom/libosmocore/libosmocore_git.bb b/recipes-osmocom/libosmocore/libosmocore_git.bb
index 9ed5a16a63..1b96f39223 100644
--- a/recipes-osmocom/libosmocore/libosmocore_git.bb
+++ b/recipes-osmocom/libosmocore/libosmocore_git.bb
@@ -1,7 +1,7 @@
 require ${PN}.inc
 
 S = "${WORKDIR}/git"
-SRCREV = "aa5d0e88944fe3258260aedfbce9101301e35b44"
+SRCREV = "08b286277b1d1c16ce3a615c5de07cefcbd6acf6"
 SRC_URI = "git://git.osmocom.org/libosmocore.git;protocol=git"
-PV = "0.5.2+gitr${SRCPV}"
+PV = "0.5.3+gitr${SRCPV}"
 PR = "0"

From 138ac3bc4595d6f8e5f0908ee3d538b4da9ef73e Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <zecke@selfish.org>
Date: Mon, 20 Aug 2012 21:26:19 +0200
Subject: [PATCH 04/10] libgsm_1.0.13: Add necessary " for the variable
 assignment

Newer versions of BitBake are more picky about it. Add the quotes.
---
 recipes-isdn/libgsm/libgsm_1.0.13.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-isdn/libgsm/libgsm_1.0.13.bb b/recipes-isdn/libgsm/libgsm_1.0.13.bb
index b26f587578..e6bf9baf60 100644
--- a/recipes-isdn/libgsm/libgsm_1.0.13.bb
+++ b/recipes-isdn/libgsm/libgsm_1.0.13.bb
@@ -1,6 +1,6 @@
 require libgsm.inc
 
-PR = ${INC_PR}.0
+PR = "${INC_PR}.0"
 
 S = "${WORKDIR}/gsm-1.0-pl13/"
 

From c0cbc30d4c47cadbb431c962aed8f41ef5411620 Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <zecke@selfish.org>
Date: Mon, 3 Sep 2012 12:18:54 +0200
Subject: [PATCH 05/10] libdbi: Add checksums for version 0.8.3

---
 recipes-misc/libdbi/libdbi_0.8.3.bb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/recipes-misc/libdbi/libdbi_0.8.3.bb b/recipes-misc/libdbi/libdbi_0.8.3.bb
index d5803c0ec4..ec1628539a 100644
--- a/recipes-misc/libdbi/libdbi_0.8.3.bb
+++ b/recipes-misc/libdbi/libdbi_0.8.3.bb
@@ -1,3 +1,7 @@
 require ${PN}.inc
 
 PR = "${INC_PR}.0"
+
+SRC_URI[md5sum] = "ca66db78d479cbfa727cf3245b5864ae"
+SRC_URI[sha256sum] = "72e41856bebb1da7b1fd1e6369358c294913f329c5e594e338b3983e6369a5e3"
+

From 1579cdf0fe6f944c745167bcc73aa889fa819d61 Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <zecke@selfish.org>
Date: Mon, 3 Sep 2012 13:37:41 +0200
Subject: [PATCH 06/10] libdbi-drivers: Add checksums for version 0.8.3

---
 recipes-misc/libdbi/libdbi-drivers_0.8.3-1.bb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/recipes-misc/libdbi/libdbi-drivers_0.8.3-1.bb b/recipes-misc/libdbi/libdbi-drivers_0.8.3-1.bb
index a4897d0190..86b8e2cdb3 100644
--- a/recipes-misc/libdbi/libdbi-drivers_0.8.3-1.bb
+++ b/recipes-misc/libdbi/libdbi-drivers_0.8.3-1.bb
@@ -1,3 +1,6 @@
 require ${PN}.inc
 
 PR = "r1"
+
+SRC_URI[md5sum] = "4de79b323162a5a7652b65b608eca6cd"
+SRC_URI[sha256sum] = "4ab9944398ce769c0deeb64d2f73555c67bc25ccd2ade1ccf552226c7b2acf72"

From 25a726eea517f0884fb526382661b7309910992c Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <zecke@selfish.org>
Date: Tue, 4 Sep 2012 14:06:23 +0200
Subject: [PATCH 07/10] libdbi-drivers: Package the *.a into a new -staticdev
 package

---
 recipes-misc/libdbi/libdbi-drivers.inc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/recipes-misc/libdbi/libdbi-drivers.inc b/recipes-misc/libdbi/libdbi-drivers.inc
index 555a6b697a..04187b06ad 100644
--- a/recipes-misc/libdbi/libdbi-drivers.inc
+++ b/recipes-misc/libdbi/libdbi-drivers.inc
@@ -25,7 +25,8 @@ EXTRA_OECONF = "--with-dbi-incdir=${STAGING_INCDIR} \
                 --disable-docs"
 
 FILES_${PN}-dbg += " ${libdir}/dbd/.debug/*.so"
-FILES_${PN}-dev += " ${libdir}/dbd/*.la ${libdir}/dbd/*.a"
+FILES_${PN}-dev += " ${libdir}/dbd/*.la "
+FILES_${PN}-staticdev += " ${libdir}/dbd/*.a"
 
 DESCRIPTION_libdbd-sqlite3 =  "SQLite3 database driver for libdbi"
 FILES_libdbd-sqlite3 = "${libdir}/dbd/libdbdsqlite3.so"

From a6cbcf75d53c3e7b790d1fafa3fbaa4b1aeca2d2 Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <zecke@selfish.org>
Date: Tue, 4 Sep 2012 14:07:17 +0200
Subject: [PATCH 08/10] libdbi-drivers: Introduce INC_PR for this recipe

---
 recipes-misc/libdbi/libdbi-drivers.inc        | 2 ++
 recipes-misc/libdbi/libdbi-drivers_0.8.3-1.bb | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/recipes-misc/libdbi/libdbi-drivers.inc b/recipes-misc/libdbi/libdbi-drivers.inc
index 04187b06ad..2fe0da7ce5 100644
--- a/recipes-misc/libdbi/libdbi-drivers.inc
+++ b/recipes-misc/libdbi/libdbi-drivers.inc
@@ -11,6 +11,8 @@ SECTION = "libs"
 PROVIDES = "libdbd-sqlite"
 DEPENDS = "libdbi sqlite3"
 
+INC_PR = "r1"
+
 SRC_URI = "${SOURCEFORGE_MIRROR}/libdbi-drivers/libdbi-drivers-${PV}.tar.gz"
 
 inherit autotools
diff --git a/recipes-misc/libdbi/libdbi-drivers_0.8.3-1.bb b/recipes-misc/libdbi/libdbi-drivers_0.8.3-1.bb
index 86b8e2cdb3..2f2e39df79 100644
--- a/recipes-misc/libdbi/libdbi-drivers_0.8.3-1.bb
+++ b/recipes-misc/libdbi/libdbi-drivers_0.8.3-1.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 
-PR = "r1"
+PR = "${INC_PR}.0"
 
 SRC_URI[md5sum] = "4de79b323162a5a7652b65b608eca6cd"
 SRC_URI[sha256sum] = "4ab9944398ce769c0deeb64d2f73555c67bc25ccd2ade1ccf552226c7b2acf72"

From 4f61482461ba0079d74a2de782559bcd979e7656 Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <zecke@selfish.org>
Date: Tue, 4 Sep 2012 14:08:36 +0200
Subject: [PATCH 09/10] openggsn: Package the *.a into a new -staticdev package

---
 recipes-osmocom/openggsn/openggsn_git.bb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/recipes-osmocom/openggsn/openggsn_git.bb b/recipes-osmocom/openggsn/openggsn_git.bb
index 9b15d9f731..8aaaf8d496 100644
--- a/recipes-osmocom/openggsn/openggsn_git.bb
+++ b/recipes-osmocom/openggsn/openggsn_git.bb
@@ -2,7 +2,7 @@ DESCRITOPN = "OpenGGSN a Free Software GGSN"
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
 PV = "0.91+gitr${SRCPV}"
-PR = "r10"
+PR = "r11"
 
 SRCREV = "95848bafcef145d776d70a73f7bdc3fe37e85724"
 SRC_URI = "git://ggsn.git.sourceforge.net/gitroot/ggsn/ggsn \
@@ -10,7 +10,7 @@ SRC_URI = "git://ggsn.git.sourceforge.net/gitroot/ggsn/ggsn \
           "
 S = "${WORKDIR}/git"
 
-PACKAGES =+ " libgtp libgtp-dev openggsn-sgsnemu"
+PACKAGES =+ " libgtp libgtp-dev libgtp-staticdev openggsn-sgsnemu"
 RDEPENDS_${PN} += "kernel-module-tun"
 
 inherit autotools update-rc.d
@@ -27,6 +27,7 @@ INITSCRIPT_PARAMS_openggsn = "defaults 29 29"
 RDEPENDS_${PN} += "iptables kernel-module-ipt-masquerade"
 
 FILES_libgtp = "${libdir}/*${SOLIBS}"
-FILES_libgtp-dev = "${includedir} ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la ${libdir}/*.a"
+FILES_libgtp-dev = "${includedir} ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la"
+FILES_libgtp-staticdev = "${libdir}/*.a"
 
 FILES_openggsn-sgsnemu = "${bindir}/sgsnemu"

From aeb390d1cf1a7e46dbed06f0fe8fe47c7bf57c71 Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <zecke@selfish.org>
Date: Thu, 13 Sep 2012 21:20:19 +0200
Subject: [PATCH 10/10] libosmocore: Upgrade to newer version with libosmovty
 improvements

---
 conf/layer.conf                                | 2 +-
 recipes-osmocom/libosmocore/libosmocore_git.bb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/conf/layer.conf b/conf/layer.conf
index 11f708973a..145b809f9b 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 = "6"
+META_TELEPHONY_OSMO_INC = "7"
diff --git a/recipes-osmocom/libosmocore/libosmocore_git.bb b/recipes-osmocom/libosmocore/libosmocore_git.bb
index 1b96f39223..55b38b3eec 100644
--- a/recipes-osmocom/libosmocore/libosmocore_git.bb
+++ b/recipes-osmocom/libosmocore/libosmocore_git.bb
@@ -1,7 +1,7 @@
 require ${PN}.inc
 
 S = "${WORKDIR}/git"
-SRCREV = "08b286277b1d1c16ce3a615c5de07cefcbd6acf6"
+SRCREV = "eacba189b1a03c6a213b76df07dd766697017438"
 SRC_URI = "git://git.osmocom.org/libosmocore.git;protocol=git"
 PV = "0.5.3+gitr${SRCPV}"
 PR = "0"