Change in meta-telephony[201705]: Update recipes to refelct osmo-iuh and osmo-hnbgw repo split
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/meta-telephony/+/26802 )
Change subject: Update recipes to refelct osmo-iuh and osmo-hnbgw repo split ......................................................................
Update recipes to refelct osmo-iuh and osmo-hnbgw repo split
Since version 1.2.0 in both repos, osmo-hnbgw binary is placed in its own repository, and no longer available in osmo-iuh.git.
Change-Id: I3ced52c1a9fccca34fe7c4ec245363d041105c2b --- A recipes-osmocom/osmo-hnbgw/osmo-hnbgw.inc A recipes-osmocom/osmo-hnbgw/osmo-hnbgw_git.bb M recipes-osmocom/osmo-iuh/osmo-iuh.inc M recipes-osmocom/osmo-iuh/osmo-iuh_git.bb 4 files changed, 68 insertions(+), 16 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/02/26802/1
diff --git a/recipes-osmocom/osmo-hnbgw/osmo-hnbgw.inc b/recipes-osmocom/osmo-hnbgw/osmo-hnbgw.inc new file mode 100644 index 0000000..3e45f9b --- /dev/null +++ b/recipes-osmocom/osmo-hnbgw/osmo-hnbgw.inc @@ -0,0 +1,23 @@ +DESCRIPTION = "Osmocom HNB-GW implementation" +HOMEPAGE = "https://osmocom.org/projects/osmohnbgw" +LICENSE = "AGPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=73f1eb20517c55bf9493b7dd6e480788" + +DEPENDS = "libosmocore libosmo-netif libosmo-sccp osmo-iuh libasn1c lksctp-tools" + +INC_PR="r0.${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/ +CACHED_CONFIGUREVARS += "ac_cv_header_netinet_sctp_h=yes" + +inherit autotools pkgconfig systemd + +PACKAGECONFIG ??= "\ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ + " +PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir},--without-systemdsystemunitdir" + +SYSTEMD_SERVICE_${PN} = "${PN}.service" + +CONFFILES_osmo-hnbgw = "${sysconfdir}/osmocom/osmo-hnbgw.cfg" diff --git a/recipes-osmocom/osmo-hnbgw/osmo-hnbgw_git.bb b/recipes-osmocom/osmo-hnbgw/osmo-hnbgw_git.bb new file mode 100644 index 0000000..df8c946 --- /dev/null +++ b/recipes-osmocom/osmo-hnbgw/osmo-hnbgw_git.bb @@ -0,0 +1,7 @@ +require ${PN}.inc + +S = "${WORKDIR}/git" +SRCREV = "1.2.0" +SRC_URI = "git://git.osmocom.org/osmo-hnbgw.git;protocol=git;tag=${SRCREV};nobranch=1" +PV = "1.2.0+gitr${SRCPV}" +PR = "${INC_PR}.0" diff --git a/recipes-osmocom/osmo-iuh/osmo-iuh.inc b/recipes-osmocom/osmo-iuh/osmo-iuh.inc index 92b4633..a5674af 100644 --- a/recipes-osmocom/osmo-iuh/osmo-iuh.inc +++ b/recipes-osmocom/osmo-iuh/osmo-iuh.inc @@ -1,26 +1,34 @@ -DESCRIPTION = "Osmocom Iuh and HNB-GW implementation" +DESCRIPTION = "Osmocom Iuh implementation" HOMEPAGE = "https://osmocom.org/projects/osmohnbgw" LICENSE = "AGPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=73f1eb20517c55bf9493b7dd6e480788"
DEPENDS = "libosmocore libosmo-netif libosmo-sccp libasn1c lksctp-tools"
-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/ CACHED_CONFIGUREVARS += "ac_cv_header_netinet_sctp_h=yes"
-inherit autotools pkgconfig systemd +inherit autotools pkgconfig
-PACKAGECONFIG ??= "\ - ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ - " -PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir},--without-systemdsystemunitdir" +PACKAGES =+ " \ + libosmo-hnbap libosmo-hnbap-dev \ + libosmo-ranap libosmo-ranap-dev \ + libosmo-rua libosmo-rua-dev \ + libosmo-sabp libosmo-sabp-dev \ + "
-PACKAGES =+ "libosmo-ranap libosmo-ranap-dev osmo-hnbgw" -SYSTEMD_PACKAGES = "osmo-hnbgw" -SYSTEMD_SERVICE_osmo-hnbgw = "osmo-hnbgw.service" +FILES_libosmo-hnbap = " \ + ${libdir}/libosmo-hnbap${SOLIBS} \ + " + +FILES_libosmo-hnbap-dev = " \ + ${includedir}/osmocom/hnbap \ + ${libdir}/pkgconfig/libosmo-hnbap.pc \ + ${libdir}/libosmo-hnbap${SOLIBSDEV} \ + "
FILES_libosmo-ranap = " \ ${libdir}/libosmo-ranap${SOLIBS} \ @@ -32,10 +40,24 @@ ${libdir}/libosmo-ranap${SOLIBSDEV} \ "
-FILES_osmo-hnbgw = " \ - ${bindir}/osmo-hnbgw \ - ${sysconfdir}/osmocom/osmo-hnbgw.cfg \ +FILES_libosmo-rua = " \ + ${libdir}/libosmo-rua${SOLIBS} \ " -CONFFILES_osmo-hnbgw = "${sysconfdir}/osmocom/osmo-hnbgw.cfg" + +FILES_libosmo-rua-dev = " \ + ${includedir}/osmocom/rua \ + ${libdir}/pkgconfig/libosmo-rua.pc \ + ${libdir}/libosmo-rua${SOLIBSDEV} \ + " + +FILES_libosmo-sabp = " \ + ${libdir}/libosmo-sabp${SOLIBS} \ + " + +FILES_libosmo-sabp-dev = " \ + ${includedir}/osmocom/sabp \ + ${libdir}/pkgconfig/libosmo-sabp.pc \ + ${libdir}/libosmo-sabp${SOLIBSDEV} \ + "
ALLOW_EMPTY_${PN} = "1" diff --git a/recipes-osmocom/osmo-iuh/osmo-iuh_git.bb b/recipes-osmocom/osmo-iuh/osmo-iuh_git.bb index d790774..c10fc66 100644 --- a/recipes-osmocom/osmo-iuh/osmo-iuh_git.bb +++ b/recipes-osmocom/osmo-iuh/osmo-iuh_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc
S = "${WORKDIR}/git" -SRCREV = "1.1.0" +SRCREV = "1.2.0" SRC_URI = "git://git.osmocom.org/osmo-iuh.git;protocol=git;tag=${SRCREV};nobranch=1" -PV = "1.1.0+gitr${SRCPV}" +PV = "1.2.0+gitr${SRCPV}" PR = "${INC_PR}.0"
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/meta-telephony/+/26802 )
Change subject: Update recipes to refelct osmo-iuh and osmo-hnbgw repo split ......................................................................
Patch Set 1: Verified+1
Tested proper build with "201705-testbranch" jenkins job. TODO: once merged, rebase laforge/nightly on top of 201705.
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/meta-telephony/+/26802 )
Change subject: Update recipes to refelct osmo-iuh and osmo-hnbgw repo split ......................................................................
Patch Set 1: Code-Review+2
laforge has submitted this change. ( https://gerrit.osmocom.org/c/meta-telephony/+/26802 )
Change subject: Update recipes to refelct osmo-iuh and osmo-hnbgw repo split ......................................................................
Update recipes to refelct osmo-iuh and osmo-hnbgw repo split
Since version 1.2.0 in both repos, osmo-hnbgw binary is placed in its own repository, and no longer available in osmo-iuh.git.
Change-Id: I3ced52c1a9fccca34fe7c4ec245363d041105c2b --- A recipes-osmocom/osmo-hnbgw/osmo-hnbgw.inc A recipes-osmocom/osmo-hnbgw/osmo-hnbgw_git.bb M recipes-osmocom/osmo-iuh/osmo-iuh.inc M recipes-osmocom/osmo-iuh/osmo-iuh_git.bb 4 files changed, 68 insertions(+), 16 deletions(-)
Approvals: pespin: Verified laforge: Looks good to me, approved
diff --git a/recipes-osmocom/osmo-hnbgw/osmo-hnbgw.inc b/recipes-osmocom/osmo-hnbgw/osmo-hnbgw.inc new file mode 100644 index 0000000..3e45f9b --- /dev/null +++ b/recipes-osmocom/osmo-hnbgw/osmo-hnbgw.inc @@ -0,0 +1,23 @@ +DESCRIPTION = "Osmocom HNB-GW implementation" +HOMEPAGE = "https://osmocom.org/projects/osmohnbgw" +LICENSE = "AGPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=73f1eb20517c55bf9493b7dd6e480788" + +DEPENDS = "libosmocore libosmo-netif libosmo-sccp osmo-iuh libasn1c lksctp-tools" + +INC_PR="r0.${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/ +CACHED_CONFIGUREVARS += "ac_cv_header_netinet_sctp_h=yes" + +inherit autotools pkgconfig systemd + +PACKAGECONFIG ??= "\ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ + " +PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir},--without-systemdsystemunitdir" + +SYSTEMD_SERVICE_${PN} = "${PN}.service" + +CONFFILES_osmo-hnbgw = "${sysconfdir}/osmocom/osmo-hnbgw.cfg" diff --git a/recipes-osmocom/osmo-hnbgw/osmo-hnbgw_git.bb b/recipes-osmocom/osmo-hnbgw/osmo-hnbgw_git.bb new file mode 100644 index 0000000..df8c946 --- /dev/null +++ b/recipes-osmocom/osmo-hnbgw/osmo-hnbgw_git.bb @@ -0,0 +1,7 @@ +require ${PN}.inc + +S = "${WORKDIR}/git" +SRCREV = "1.2.0" +SRC_URI = "git://git.osmocom.org/osmo-hnbgw.git;protocol=git;tag=${SRCREV};nobranch=1" +PV = "1.2.0+gitr${SRCPV}" +PR = "${INC_PR}.0" diff --git a/recipes-osmocom/osmo-iuh/osmo-iuh.inc b/recipes-osmocom/osmo-iuh/osmo-iuh.inc index 92b4633..a5674af 100644 --- a/recipes-osmocom/osmo-iuh/osmo-iuh.inc +++ b/recipes-osmocom/osmo-iuh/osmo-iuh.inc @@ -1,26 +1,34 @@ -DESCRIPTION = "Osmocom Iuh and HNB-GW implementation" +DESCRIPTION = "Osmocom Iuh implementation" HOMEPAGE = "https://osmocom.org/projects/osmohnbgw" LICENSE = "AGPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=73f1eb20517c55bf9493b7dd6e480788"
DEPENDS = "libosmocore libosmo-netif libosmo-sccp libasn1c lksctp-tools"
-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/ CACHED_CONFIGUREVARS += "ac_cv_header_netinet_sctp_h=yes"
-inherit autotools pkgconfig systemd +inherit autotools pkgconfig
-PACKAGECONFIG ??= "\ - ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ - " -PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir},--without-systemdsystemunitdir" +PACKAGES =+ " \ + libosmo-hnbap libosmo-hnbap-dev \ + libosmo-ranap libosmo-ranap-dev \ + libosmo-rua libosmo-rua-dev \ + libosmo-sabp libosmo-sabp-dev \ + "
-PACKAGES =+ "libosmo-ranap libosmo-ranap-dev osmo-hnbgw" -SYSTEMD_PACKAGES = "osmo-hnbgw" -SYSTEMD_SERVICE_osmo-hnbgw = "osmo-hnbgw.service" +FILES_libosmo-hnbap = " \ + ${libdir}/libosmo-hnbap${SOLIBS} \ + " + +FILES_libosmo-hnbap-dev = " \ + ${includedir}/osmocom/hnbap \ + ${libdir}/pkgconfig/libosmo-hnbap.pc \ + ${libdir}/libosmo-hnbap${SOLIBSDEV} \ + "
FILES_libosmo-ranap = " \ ${libdir}/libosmo-ranap${SOLIBS} \ @@ -32,10 +40,24 @@ ${libdir}/libosmo-ranap${SOLIBSDEV} \ "
-FILES_osmo-hnbgw = " \ - ${bindir}/osmo-hnbgw \ - ${sysconfdir}/osmocom/osmo-hnbgw.cfg \ +FILES_libosmo-rua = " \ + ${libdir}/libosmo-rua${SOLIBS} \ " -CONFFILES_osmo-hnbgw = "${sysconfdir}/osmocom/osmo-hnbgw.cfg" + +FILES_libosmo-rua-dev = " \ + ${includedir}/osmocom/rua \ + ${libdir}/pkgconfig/libosmo-rua.pc \ + ${libdir}/libosmo-rua${SOLIBSDEV} \ + " + +FILES_libosmo-sabp = " \ + ${libdir}/libosmo-sabp${SOLIBS} \ + " + +FILES_libosmo-sabp-dev = " \ + ${includedir}/osmocom/sabp \ + ${libdir}/pkgconfig/libosmo-sabp.pc \ + ${libdir}/libosmo-sabp${SOLIBSDEV} \ + "
ALLOW_EMPTY_${PN} = "1" diff --git a/recipes-osmocom/osmo-iuh/osmo-iuh_git.bb b/recipes-osmocom/osmo-iuh/osmo-iuh_git.bb index d790774..c10fc66 100644 --- a/recipes-osmocom/osmo-iuh/osmo-iuh_git.bb +++ b/recipes-osmocom/osmo-iuh/osmo-iuh_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc
S = "${WORKDIR}/git" -SRCREV = "1.1.0" +SRCREV = "1.2.0" SRC_URI = "git://git.osmocom.org/osmo-iuh.git;protocol=git;tag=${SRCREV};nobranch=1" -PV = "1.1.0+gitr${SRCPV}" +PV = "1.2.0+gitr${SRCPV}" PR = "${INC_PR}.0"
-
laforge -
pespin