diff --git a/meta-telephony/conf/layer.conf b/meta-telephony/conf/layer.conf index 0ddda0d069..145b809f9b 100644 --- a/meta-telephony/conf/layer.conf +++ b/meta-telephony/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 = "7" diff --git a/meta-telephony/recipes-isdn/libgsm/libgsm_1.0.13.bb b/meta-telephony/recipes-isdn/libgsm/libgsm_1.0.13.bb index b26f587578..e6bf9baf60 100644 --- a/meta-telephony/recipes-isdn/libgsm/libgsm_1.0.13.bb +++ b/meta-telephony/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/" diff --git a/meta-telephony/recipes-misc/libdbi/libdbi-drivers.inc b/meta-telephony/recipes-misc/libdbi/libdbi-drivers.inc index 555a6b697a..2fe0da7ce5 100644 --- a/meta-telephony/recipes-misc/libdbi/libdbi-drivers.inc +++ b/meta-telephony/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 @@ -25,7 +27,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" diff --git a/meta-telephony/recipes-misc/libdbi/libdbi-drivers_0.8.3-1.bb b/meta-telephony/recipes-misc/libdbi/libdbi-drivers_0.8.3-1.bb index a4897d0190..2f2e39df79 100644 --- a/meta-telephony/recipes-misc/libdbi/libdbi-drivers_0.8.3-1.bb +++ b/meta-telephony/recipes-misc/libdbi/libdbi-drivers_0.8.3-1.bb @@ -1,3 +1,6 @@ require ${PN}.inc -PR = "r1" +PR = "${INC_PR}.0" + +SRC_URI[md5sum] = "4de79b323162a5a7652b65b608eca6cd" +SRC_URI[sha256sum] = "4ab9944398ce769c0deeb64d2f73555c67bc25ccd2ade1ccf552226c7b2acf72" diff --git a/meta-telephony/recipes-misc/libdbi/libdbi_0.8.3.bb b/meta-telephony/recipes-misc/libdbi/libdbi_0.8.3.bb index d5803c0ec4..ec1628539a 100644 --- a/meta-telephony/recipes-misc/libdbi/libdbi_0.8.3.bb +++ b/meta-telephony/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" + diff --git a/meta-telephony/recipes-osmocom/libosmocore/libosmocore_0.5.3.bb b/meta-telephony/recipes-osmocom/libosmocore/libosmocore_0.5.3.bb new file mode 100644 index 0000000000..d7b84d8de2 --- /dev/null +++ b/meta-telephony/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/meta-telephony/recipes-osmocom/libosmocore/libosmocore_git.bb b/meta-telephony/recipes-osmocom/libosmocore/libosmocore_git.bb index ccc6999d8c..55b38b3eec 100644 --- a/meta-telephony/recipes-osmocom/libosmocore/libosmocore_git.bb +++ b/meta-telephony/recipes-osmocom/libosmocore/libosmocore_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "c5f055f9e5aa58548b484345bd3bdc914e640d6c" +SRCREV = "eacba189b1a03c6a213b76df07dd766697017438" SRC_URI = "git://git.osmocom.org/libosmocore.git;protocol=git" -PV = "0.5.2+gitr${SRCPV}" +PV = "0.5.3+gitr${SRCPV}" PR = "0" diff --git a/meta-telephony/recipes-osmocom/openbsc/openbsc_git.bb b/meta-telephony/recipes-osmocom/openbsc/openbsc_git.bb index e661f9ca0e..7b20795539 100644 --- a/meta-telephony/recipes-osmocom/openbsc/openbsc_git.bb +++ b/meta-telephony/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" diff --git a/meta-telephony/recipes-osmocom/openggsn/openggsn_git.bb b/meta-telephony/recipes-osmocom/openggsn/openggsn_git.bb index 9b15d9f731..8aaaf8d496 100644 --- a/meta-telephony/recipes-osmocom/openggsn/openggsn_git.bb +++ b/meta-telephony/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"