osmith has submitted this change. ( https://gerrit.osmocom.org/c/meta-telephony/+/38771?usp=email )
Change subject: libosmo-sigtran: replace libosmo-sccp ......................................................................
libosmo-sigtran: replace libosmo-sccp
Related: https://osmocom.org/news/273 Change-Id: Ib72014b2ba531f041a5112cc80b3320705b931d2 --- D recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb R recipes-osmocom/libosmo-sigtran/libosmo-sigtran.inc A recipes-osmocom/libosmo-sigtran/libosmo-sigtran_git.bb M recipes-osmocom/openbsc/openbsc.inc M recipes-osmocom/osmo-bsc/osmo-bsc.inc M recipes-osmocom/osmo-hnbgw/osmo-hnbgw.inc M recipes-osmocom/osmo-iuh/osmo-iuh.inc M recipes-osmocom/osmo-msc/osmo-msc.inc M recipes-osmocom/osmo-sgsn/osmo-sgsn.inc M recipes-osmocom/packagegroup/packagegroup-sdk-osmo.inc M recipes-telephony/tasks/task-telephony-all.bb 11 files changed, 21 insertions(+), 23 deletions(-)
Approvals: pespin: Looks good to me, approved osmith: Verified
diff --git a/recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb b/recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb deleted file mode 100644 index 917afde..0000000 --- a/recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb +++ /dev/null @@ -1,7 +0,0 @@ -require ${PN}.inc - -S = "${WORKDIR}/git" -SRCREV = "1.9.0" -SRC_URI = "git://gerrit.osmocom.org/libosmo-sccp.git;protocol=https;tag=${SRCREV};nobranch=1" -PV = "1.9.0+gitr${SRCPV}" -PR = "${INC_PR}.0" diff --git a/recipes-osmocom/libosmo-sccp/libosmo-sccp.inc b/recipes-osmocom/libosmo-sigtran/libosmo-sigtran.inc similarity index 97% rename from recipes-osmocom/libosmo-sccp/libosmo-sccp.inc rename to recipes-osmocom/libosmo-sigtran/libosmo-sigtran.inc index 34454b1..84578f1 100644 --- a/recipes-osmocom/libosmo-sccp/libosmo-sccp.inc +++ b/recipes-osmocom/libosmo-sigtran/libosmo-sigtran.inc @@ -37,5 +37,3 @@ ${sysconfdir}/osmocom/osmo-stp.cfg \ " CONFFILES_osmo-stp = "${sysconfdir}/osmocom/osmo-stp.cfg" - -ALLOW_EMPTY_libosmo-sccp = "1" diff --git a/recipes-osmocom/libosmo-sigtran/libosmo-sigtran_git.bb b/recipes-osmocom/libosmo-sigtran/libosmo-sigtran_git.bb new file mode 100644 index 0000000..bd5ef0f --- /dev/null +++ b/recipes-osmocom/libosmo-sigtran/libosmo-sigtran_git.bb @@ -0,0 +1,7 @@ +require ${PN}.inc + +S = "${WORKDIR}/git" +SRCREV = "2.0.0" +SRC_URI = "git://gerrit.osmocom.org/libosmo-sigtran.git;protocol=https;tag=${SRCREV};nobranch=1" +PV = "2.0.0+gitr${SRCPV}" +PR = "${INC_PR}.0" diff --git a/recipes-osmocom/openbsc/openbsc.inc b/recipes-osmocom/openbsc/openbsc.inc index 71921b7..4c0486d 100644 --- a/recipes-osmocom/openbsc/openbsc.inc +++ b/recipes-osmocom/openbsc/openbsc.inc @@ -1,12 +1,12 @@ DESCRIPTION = "OpenBSC a Free Software GSM BaseStationController" -DEPENDS = "libdbi libosmocore libosmo-sccp libosmo-abis libosmo-netif osmo-ggsn libsmpp34 bcg729 libgsm libpcap" +DEPENDS = "libdbi libosmocore libosmo-sigtran libosmo-abis libosmo-netif osmo-ggsn libsmpp34 bcg729 libgsm libpcap" HOMEPAGE = "http://openbsc.osmocom.org/" LICENSE = "AGPLv3+" LIC_FILES_CHKSUM = "file://COPYING;md5=73f1eb20517c55bf9493b7dd6e480788"
RDEPENDS_osmo-nitb = "libdbd-sqlite3"
-INC_PR = "r4.${META_TELEPHONY_OSMO_INC}" +INC_PR = "r5.${META_TELEPHONY_OSMO_INC}"
EXTRA_OECONF += "--enable-nat --enable-osmo-bsc --enable-smpp --enable-mgcp-transcoding --with-g729"
diff --git a/recipes-osmocom/osmo-bsc/osmo-bsc.inc b/recipes-osmocom/osmo-bsc/osmo-bsc.inc index 1c56123..b74c520 100644 --- a/recipes-osmocom/osmo-bsc/osmo-bsc.inc +++ b/recipes-osmocom/osmo-bsc/osmo-bsc.inc @@ -3,9 +3,9 @@ LICENSE = "AGPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=73f1eb20517c55bf9493b7dd6e480788"
-DEPENDS = "sqlite3 libpcap libosmocore libosmo-abis libosmo-sccp libosmo-netif osmo-mgw" +DEPENDS = "sqlite3 libpcap libosmocore libosmo-abis libosmo-sigtran libosmo-netif osmo-mgw"
-INC_PR="r3.${META_TELEPHONY_OSMO_INC}" +INC_PR="r4.${META_TELEPHONY_OSMO_INC}"
inherit autotools pkgconfig systemd
diff --git a/recipes-osmocom/osmo-hnbgw/osmo-hnbgw.inc b/recipes-osmocom/osmo-hnbgw/osmo-hnbgw.inc index c83ce12..be691f7 100644 --- a/recipes-osmocom/osmo-hnbgw/osmo-hnbgw.inc +++ b/recipes-osmocom/osmo-hnbgw/osmo-hnbgw.inc @@ -3,9 +3,9 @@ LICENSE = "AGPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=73f1eb20517c55bf9493b7dd6e480788"
-DEPENDS = "libosmocore libosmo-netif libosmo-sccp osmo-iuh libasn1c lksctp-tools osmo-mgw" +DEPENDS = "libosmocore libosmo-netif libosmo-sigtran osmo-iuh libasn1c lksctp-tools osmo-mgw"
-INC_PR="r2.${META_TELEPHONY_OSMO_INC}" +INC_PR="r3.${META_TELEPHONY_OSMO_INC}"
# Workaround to oe-core meta/site/* CONFIG_SITE files passed to autoconf forcing unavailability of netinet/sctp.h. # Patch fixing issue upstream: https://patchwork.openembedded.org/patch/168892/ diff --git a/recipes-osmocom/osmo-iuh/osmo-iuh.inc b/recipes-osmocom/osmo-iuh/osmo-iuh.inc index a5674af..9b3701e 100644 --- a/recipes-osmocom/osmo-iuh/osmo-iuh.inc +++ b/recipes-osmocom/osmo-iuh/osmo-iuh.inc @@ -3,9 +3,9 @@ LICENSE = "AGPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=73f1eb20517c55bf9493b7dd6e480788"
-DEPENDS = "libosmocore libosmo-netif libosmo-sccp libasn1c lksctp-tools" +DEPENDS = "libosmocore libosmo-netif libosmo-sigtran libasn1c lksctp-tools"
-INC_PR="r3.${META_TELEPHONY_OSMO_INC}" +INC_PR="r4.${META_TELEPHONY_OSMO_INC}"
# Workaround to oe-core meta/site/* CONFIG_SITE files passed to autoconf forcing unavailability of netinet/sctp.h. # Patch fixing issue upstream: https://patchwork.openembedded.org/patch/168892/ diff --git a/recipes-osmocom/osmo-msc/osmo-msc.inc b/recipes-osmocom/osmo-msc/osmo-msc.inc index 23a762a..ad2af00 100644 --- a/recipes-osmocom/osmo-msc/osmo-msc.inc +++ b/recipes-osmocom/osmo-msc/osmo-msc.inc @@ -3,9 +3,9 @@ LICENSE = "AGPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=73f1eb20517c55bf9493b7dd6e480788"
-DEPENDS = "libdbi libosmocore libosmo-abis libosmo-sccp libosmo-netif osmo-mgw osmo-hlr" +DEPENDS = "libdbi libosmocore libosmo-abis libosmo-sigtran libosmo-netif osmo-mgw osmo-hlr"
-INC_PR="r4.${META_TELEPHONY_OSMO_INC}" +INC_PR="r5.${META_TELEPHONY_OSMO_INC}"
inherit autotools pkgconfig systemd
diff --git a/recipes-osmocom/osmo-sgsn/osmo-sgsn.inc b/recipes-osmocom/osmo-sgsn/osmo-sgsn.inc index 2effb5d..ac6d56a 100644 --- a/recipes-osmocom/osmo-sgsn/osmo-sgsn.inc +++ b/recipes-osmocom/osmo-sgsn/osmo-sgsn.inc @@ -5,7 +5,7 @@
DEPENDS = "c-ares libosmocore libosmo-netif osmo-ggsn osmo-hlr"
-INC_PR="r3.${META_TELEPHONY_OSMO_INC}" +INC_PR="r4.${META_TELEPHONY_OSMO_INC}"
inherit autotools pkgconfig systemd
@@ -14,7 +14,7 @@ ${@bb.utils.filter('DISTRO_FEATURES', 'iu', d)} \ " PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir},--without-systemdsystemunitdir" -PACKAGECONFIG[iu] = "--enable-iu,--disable-iu,libasn1c libosmo-sccp osmo-iuh," +PACKAGECONFIG[iu] = "--enable-iu,--disable-iu,libasn1c libosmo-sigtran osmo-iuh,"
do_install_append() { # StateDirectory requires systemd >= v235, but poky pyro ships with v232 (SYS#6340): diff --git a/recipes-osmocom/packagegroup/packagegroup-sdk-osmo.inc b/recipes-osmocom/packagegroup/packagegroup-sdk-osmo.inc index 5055689..40c57e0 100644 --- a/recipes-osmocom/packagegroup/packagegroup-sdk-osmo.inc +++ b/recipes-osmocom/packagegroup/packagegroup-sdk-osmo.inc @@ -3,7 +3,7 @@ libusb1-dev \ libtalloc-dev \ libosmocore-dev \ - libosmo-sccp-staticdev \ + libosmo-sigtran-dev \ libosmo-abis-dev \ libosmotrau-dev \ libgtp-dev \ diff --git a/recipes-telephony/tasks/task-telephony-all.bb b/recipes-telephony/tasks/task-telephony-all.bb index 5efec10..725e2ef 100644 --- a/recipes-telephony/tasks/task-telephony-all.bb +++ b/recipes-telephony/tasks/task-telephony-all.bb @@ -7,7 +7,7 @@
DEPENDS = "\ libosmo-abis \ - libosmo-sccp \ + libosmo-sigtran \ libosmocore \ openbsc \ packagegroup-osmocom \
-
osmith