diff options
40 files changed, 311 insertions, 110 deletions
diff --git a/recipes-extended/libmnl/libmnl_1.0.4.bb b/recipes-extended/libmnl/libmnl_1.0.4.bb new file mode 100644 index 0000000..b55bb31 --- /dev/null +++ b/recipes-extended/libmnl/libmnl_1.0.4.bb @@ -0,0 +1,15 @@ +SUMMARY = "Minimalistic user-space Netlink utility library" +DESCRIPTION = "Minimalistic user-space library oriented to Netlink developers, providing \ + functions for common tasks in parsing, validating, and constructing both the Netlink header and TLVs." +HOMEPAGE = "https://www.netfilter.org/projects/libmnl/index.html" +SECTION = "libs" +LICENSE = "LGPLv2.1+" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +SRC_URI = "https://netfilter.org/projects/libmnl/files/libmnl-${PV}.tar.bz2;name=tar" +SRC_URI[tar.md5sum] = "be9b4b5328c6da1bda565ac5dffadb2d" +SRC_URI[tar.sha256sum] = "171f89699f286a5854b72b91d06e8f8e3683064c5901fb09d954a9ab6f551f81" + +inherit autotools pkgconfig + +BBCLASSEXTEND = "native" diff --git a/recipes-isdn/lcr/lcr_git.bb b/recipes-isdn/lcr/lcr_git.bb index 4bcf762..d50459f 100644 --- a/recipes-isdn/lcr/lcr_git.bb +++ b/recipes-isdn/lcr/lcr_git.bb @@ -8,7 +8,7 @@ PV = "1.14+gitr${SRCPV}" PR = "r4" SRCREV = "38fce218f8897d120aeba56e811ef7dada898c2c" -SRC_URI = "git://git.misdn.eu/lcr.git \ +SRC_URI = "git://github.com/fairwaves/lcr;protocol=https \ file://lcr-disable-gsmfr.diff \ file://0001-Fixed-compiler-warnings.patch \ file://lcr.init " diff --git a/recipes-isdn/misdn/misdn-utils_git.bb b/recipes-isdn/misdn/misdn-utils_git.bb index 74acc62..a1a3fc3 100644 --- a/recipes-isdn/misdn/misdn-utils_git.bb +++ b/recipes-isdn/misdn/misdn-utils_git.bb @@ -4,7 +4,7 @@ LICENSE = "LGPLv2+" LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=55ca817ccb7d5b5b66355690e9abc605" SRC_URI = "\ - git://git.misdn.eu/mISDNuser.git;branch=socket \ + git://github.com/ISDN4Linux/mISDNuser;protocol=https \ file://0001-mbuffer-data-size.patch \ " # Release v2.0.19 diff --git a/recipes-misc/bcg729/bcg729_git.bb b/recipes-misc/bcg729/bcg729_git.bb index 27b2b75..cfd5bec 100644 --- a/recipes-misc/bcg729/bcg729_git.bb +++ b/recipes-misc/bcg729/bcg729_git.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.linphone.org/eng/documentation/dev/bcg729.html" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -SRC_URI = "git://git.linphone.org/bcg729.git" +SRC_URI = "git://gitlab.linphone.org/BC/public/bcg729.git;protocol=https" SRCREV = "2e36a5d4bc6e992c654eee6b0a8db729da7b1d31" PV = "0+gitr${SRCPV}" diff --git a/recipes-misc/libsmpp/libsmpp34_git.bb b/recipes-misc/libsmpp/libsmpp34_git.bb index 9da4f54..6dda1fa 100644 --- a/recipes-misc/libsmpp/libsmpp34_git.bb +++ b/recipes-misc/libsmpp/libsmpp34_git.bb @@ -6,9 +6,9 @@ SECTION = "libs" DEPENDS = "libxml2" S = "${WORKDIR}/git" -SRCREV = "d2704da4cb3efdf241d2cde037688badaef53f9a" -SRC_URI = "git://git.osmocom.org/libsmpp34.git;protocol=git" -PV = "1.14.0+gitr${SRCPV}" +SRCREV = "1.14.3" +SRC_URI = "git://gerrit.osmocom.org/libsmpp34.git;protocol=https;tag=${SRCREV};nobranch=1" +PV = "1.14.3+gitr${SRCPV}" PR = "r0" PARALLEL_MAKE = "" diff --git a/recipes-openmoko/openmoko-gsmd/openmoko-gsmd_git.bb b/recipes-openmoko/openmoko-gsmd/openmoko-gsmd_git.bb index 1aeb49f..21014c4 100644 --- a/recipes-openmoko/openmoko-gsmd/openmoko-gsmd_git.bb +++ b/recipes-openmoko/openmoko-gsmd/openmoko-gsmd_git.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ file://COPYING.library;md5=2d5025d4aa3495befef8f17206a5b0a1 " # Fork with wavecom support -SRC_URI = "git://git.gnumonks.org/openmoko-gsmd.git;branch=master \ +SRC_URI = "git://git.gnumonks.org/openmoko-gsmd;protocol=https;branch=master \ file://gsmd \ file://cell-log \ file://default" diff --git a/recipes-osmocom/libasn1c/libasn1c_git.bb b/recipes-osmocom/libasn1c/libasn1c_git.bb index 879a22f..366f711 100644 --- a/recipes-osmocom/libasn1c/libasn1c_git.bb +++ b/recipes-osmocom/libasn1c/libasn1c_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "19205a38c34175f4fb4d1d06e77f1d3e4a39c651" -SRC_URI = "git://git.osmocom.org/libasn1c.git;protocol=git" -PV = "0.9.32+gitr${SRCPV}" +SRCREV = "0.9.36" +SRC_URI = "git://gerrit.osmocom.org/libasn1c.git;protocol=https;tag=${SRCREV};nobranch=1" +PV = "0.9.36+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb b/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb index 0582599..40a3bf2 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 = "c313d44272f04b24dad38f4caea17180f9cbc509" -SRC_URI = "git://git.osmocom.org/libosmo-abis.git;protocol=git" -PV = "0.8.0+gitr${SRCPV}" +SRCREV = "1.5.0" +SRC_URI = "git://gerrit.osmocom.org/libosmo-abis.git;protocol=https;tag=${SRCREV};nobranch=1" +PV = "1.5.0+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/libosmo-netif/libosmo-netif.inc b/recipes-osmocom/libosmo-netif/libosmo-netif.inc index a353be6..3b5ef19 100644 --- a/recipes-osmocom/libosmo-netif/libosmo-netif.inc +++ b/recipes-osmocom/libosmo-netif/libosmo-netif.inc @@ -1,10 +1,19 @@ DESCRIPTION = "Osmocom network interface library" -DEPENDS = "libosmo-abis libtalloc lksctp-tools" -HOMEPAGE = "http://git.osmocom.org" +HOMEPAGE = "https://osmocom.org/projects/libosmo-netif" LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -INC_PR="r0.${META_TELEPHONY_OSMO_INC}" +INC_PR="r1.${META_TELEPHONY_OSMO_INC}" -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" +DEPENDS = "libosmo-abis libtalloc" + +PACKAGECONFIG ??= "\ + libsctp \ + " +PACKAGECONFIG[libsctp] = "--enable-libsctp,--disable-libsctp,lksctp-tools," + +# 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 += "${@bb.utils.contains('PACKAGECONFIG', 'libsctp', 'ac_cv_header_netinet_sctp_h=yes', '',d)}" inherit autotools pkgconfig diff --git a/recipes-osmocom/libosmo-netif/libosmo-netif_git.bb b/recipes-osmocom/libosmo-netif/libosmo-netif_git.bb index c52c7e9..c07770c 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 = "b8121e79ef53b30df535fb38987b3a48853ebbe9" -SRC_URI = "git://git.osmocom.org/libosmo-netif.git;protocol=git" -PV = "0.7.0+gitr${SRCPV}" +SRCREV = "1.4.0" +SRC_URI = "git://gerrit.osmocom.org/libosmo-netif.git;protocol=https;tag=${SRCREV};nobranch=1" +PV = "1.4.0+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/libosmo-sccp/libosmo-sccp.inc b/recipes-osmocom/libosmo-sccp/libosmo-sccp.inc index 78dd525..0f1f28d 100644 --- a/recipes-osmocom/libosmo-sccp/libosmo-sccp.inc +++ b/recipes-osmocom/libosmo-sccp/libosmo-sccp.inc @@ -3,7 +3,7 @@ DEPENDS = "libosmocore libosmo-netif" HOMEPAGE = "https://osmocom.org/projects/libosmo-sccp" LICENSE = "AGPLv3" -INC_PR="r1.${META_TELEPHONY_OSMO_INC}" +INC_PR="r2.${META_TELEPHONY_OSMO_INC}" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" @@ -18,6 +18,12 @@ PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir}, # access symbols not starting with osmo_* EXTRA_OECONF_remove = "--disable-static" +# StateDirectory requires systemd >= v235, but poky pyro ships with v232 (SYS#6340): +do_install_append() { + sed -i '/^StateDirectory=/d' "${D}${systemd_system_unitdir}/osmo-stp.service" + sed -i '/^WorkingDirectory=/d' "${D}${systemd_system_unitdir}/osmo-stp.service" +} + PACKAGES =+ "osmo-stp" SYSTEMD_PACKAGES = "osmo-stp" SYSTEMD_SERVICE_osmo-stp = "osmo-stp.service" diff --git a/recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb b/recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb index 31fa234..b269213 100644 --- a/recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb +++ b/recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "5e4643f4bc76a1437621348550b5b2a603e2179b" -SRC_URI = "git://git.osmocom.org/libosmo-sccp.git;protocol=git" -PV = "1.2.0+gitr${SRCPV}" +SRCREV = "1.8.0" +SRC_URI = "git://gerrit.osmocom.org/libosmo-sccp.git;protocol=https;tag=${SRCREV};nobranch=1" +PV = "1.8.0+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/libosmocore/libosmocore.inc b/recipes-osmocom/libosmocore/libosmocore.inc index e5b34ae..ed1caa0 100644 --- a/recipes-osmocom/libosmocore/libosmocore.inc +++ b/recipes-osmocom/libosmocore/libosmocore.inc @@ -6,11 +6,17 @@ INC_PR="r2.${META_TELEPHONY_OSMO_INC}" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -DEPENDS = "libtalloc gnutls lksctp-tools" +DEPENDS = "libtalloc" PACKAGECONFIG ??= "\ + gnutls \ libusb \ + libsctp \ + libmnl \ " +PACKAGECONFIG[gnutls] = "--enable-gnutls,--disable-gnutls,gnutls," PACKAGECONFIG[libusb] = "--enable-libusb,--disable-libusb,libusb," +PACKAGECONFIG[libsctp] = "--enable-libsctp,--disable-libsctp,lksctp-tools," +PACKAGECONFIG[libmnl] = "--enable-libmnl,--disable-libmnl,libmnl," inherit autotools pkgconfig diff --git a/recipes-osmocom/libosmocore/libosmocore_git.bb b/recipes-osmocom/libosmocore/libosmocore_git.bb index d5eab3a..6b1c941 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 = "2862f9082ed4f16383a134e1112610d76ad91bf0" -SRC_URI = "git://git.osmocom.org/libosmocore.git;protocol=git;nobranch=1" -PV = "1.3.0+gitr${SRCPV}" +SRCREV = "1.9.0" +SRC_URI = "git://gerrit.osmocom.org/libosmocore.git;protocol=https;tag=${SRCREV};nobranch=1" +PV = "1.9.0+gitr${SRCPV}" PR = "${INC_PR}.0" PACKAGES =+ "libosmoctrl libosmocodec libosmogb libosmogsm libosmovty osmo-arfcn osmo-auc-gen osmo-config-merge" @@ -24,7 +24,7 @@ RREPLACES_libosmogb = "DONOTREPLACElibosmocore" RREPLACES_libosmogsm = "DONOTREPLACElibosmocore" RREPLACES_libosmovty = "DONOTREPLACElibosmocore" -EXTRA_OECONF += "--disable-pcsc" +EXTRA_OECONF += "--disable-pcsc --disable-uring" # OS#4062: Some gcc version (< 7.3.0) on ARM generate wrong code for __thread # variables that crash at runtime. It seems, due to some unknown reason, that we @@ -36,4 +36,12 @@ EXTRA_OECONF += "--disable-pcsc" # we are not affected by the bug, we are fine with that. If the toolchain had # the TLS runtime bug, then we'd had to build with -O0. Can be probably dropped # once we move to newer toolchain. -EXTRA_OECONF += "--disable-detect-tls-gcc-arm-bug" +#EXTRA_OECONF += "--disable-detect-tls-gcc-arm-bug" +# UPDATE: OS#5079: we stop using "--disable-detect-tls-gcc-arm-bug" because we +# finally hit the TLS bug in sysmobts (osmo-bts-symo calling osmo_str_tolower() +# which uses "static __thread char capsbuf"). As a result, the only option would +# be to use -O0 when building libosmocore with the sysmobts toolchain. In order +# to avoid that, we take advantage of the fact that no libosmocore multi-thread +# process is expected to run there and simply drop all the "__thread" +# references when building for sysmobts. That's done as a machine-specific +# bbappend in meta-sysmocom-bsp. diff --git a/recipes-osmocom/openbsc/openbsc_git.bb b/recipes-osmocom/openbsc/openbsc_git.bb index 98318a4..5f727d0 100644 --- a/recipes-osmocom/openbsc/openbsc_git.bb +++ b/recipes-osmocom/openbsc/openbsc_git.bb @@ -1,10 +1,10 @@ require ${PN}.inc -PV = "1.3.2+gitr${SRCPV}" +PV = "1.4.2+gitr${SRCPV}" PRINC = "0" PR = "${INC_PR}.0" -SRCREV = "3f457a3b79e2908664b40eab9ca8e70c44a54898" -SRC_URI += "git://git.osmocom.org/openbsc.git;protocol=git" +SRCREV = "21cebdfa29829975e5b94688f3fc8d0b10e3fa14" +SRC_URI += "git://gerrit.osmocom.org/openbsc.git;protocol=https" S = "${WORKDIR}/git/openbsc" diff --git a/recipes-osmocom/osmo-bsc/osmo-bsc.inc b/recipes-osmocom/osmo-bsc/osmo-bsc.inc index 484a779..50e8f9b 100644 --- a/recipes-osmocom/osmo-bsc/osmo-bsc.inc +++ b/recipes-osmocom/osmo-bsc/osmo-bsc.inc @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=73f1eb20517c55bf9493b7dd6e480788" DEPENDS = "sqlite3 libpcap libosmocore libosmo-abis libosmo-sccp libosmo-netif osmo-mgw" -INC_PR="r1.${META_TELEPHONY_OSMO_INC}" +INC_PR="r2.${META_TELEPHONY_OSMO_INC}" inherit autotools pkgconfig systemd @@ -14,6 +14,12 @@ PACKAGECONFIG ??= "\ " PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir},--without-systemdsystemunitdir" +# StateDirectory requires systemd >= v235, but poky pyro ships with v232 (SYS#6340): +do_install_append() { + sed -i '/^StateDirectory=/d' "${D}${systemd_system_unitdir}/${PN}.service" + sed -i '/^WorkingDirectory=/d' "${D}${systemd_system_unitdir}/${PN}.service" +} + PACKAGES =+ "meas-utils ipaccess-utils bs11-utils abisip-find" SYSTEMD_PACKAGES = "osmo-bsc" SYSTEMD_SERVICE_osmo-bsc = "osmo-bsc.service" diff --git a/recipes-osmocom/osmo-bsc/osmo-bsc_git.bb b/recipes-osmocom/osmo-bsc/osmo-bsc_git.bb index fdb389b..f47ed91 100644 --- a/recipes-osmocom/osmo-bsc/osmo-bsc_git.bb +++ b/recipes-osmocom/osmo-bsc/osmo-bsc_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "a1362ce8c20b2fa60e3da67936ea69d406e23aff" -SRC_URI = "git://git.osmocom.org/osmo-bsc.git;protocol=git" -PV = "1.6.0+gitr${SRCPV}" +SRCREV = "1.11.0" +SRC_URI = "git://gerrit.osmocom.org/osmo-bsc.git;protocol=https;tag=${SRCREV};nobranch=1" +PV = "1.11.0+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/osmo-gbproxy/osmo-gbproxy.inc b/recipes-osmocom/osmo-gbproxy/osmo-gbproxy.inc new file mode 100644 index 0000000..aff20fa --- /dev/null +++ b/recipes-osmocom/osmo-gbproxy/osmo-gbproxy.inc @@ -0,0 +1,25 @@ +DESCRIPTION = "Osmocom's Gb interface aggregation/conversion proxy" +HOMEPAGE = "https://osmocom.org/projects/osmo-gbproxy" +LICENSE = "AGPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=73f1eb20517c55bf9493b7dd6e480788" + +DEPENDS = "libosmocore" + +INC_PR="r1.${META_TELEPHONY_OSMO_INC}" + +inherit autotools pkgconfig systemd + +PACKAGECONFIG ??= "\ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ + " +PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir},--without-systemdsystemunitdir" + +# StateDirectory requires systemd >= v235, but poky pyro ships with v232 (SYS#6340): +do_install_append() { + sed -i '/^StateDirectory=/d' "${D}${systemd_system_unitdir}/${PN}.service" + sed -i '/^WorkingDirectory=/d' "${D}${systemd_system_unitdir}/${PN}.service" +} + +SYSTEMD_SERVICE_osmo-gbproxy = "osmo-gbproxy.service" + +CONFFILES_osmo-gbproxy = "${sysconfdir}/osmocom/osmo-gbproxy.cfg" diff --git a/recipes-osmocom/osmo-gbproxy/osmo-gbproxy_git.bb b/recipes-osmocom/osmo-gbproxy/osmo-gbproxy_git.bb new file mode 100644 index 0000000..3ad71c4 --- /dev/null +++ b/recipes-osmocom/osmo-gbproxy/osmo-gbproxy_git.bb @@ -0,0 +1,7 @@ +require ${PN}.inc + +S = "${WORKDIR}/git" +SRCREV = "0.4.1" +SRC_URI = "git://gerrit.osmocom.org/osmo-gbproxy.git;protocol=https;tag=${SRCREV};nobranch=1" +PV = "0.4.1+gitr${SRCPV}" +PR = "${INC_PR}.0" diff --git a/recipes-osmocom/osmo-ggsn/files/0001-libgtp-set-PDP_MAX-to-128.patch b/recipes-osmocom/osmo-ggsn/files/0001-libgtp-set-PDP_MAX-to-128.patch new file mode 100644 index 0000000..53ac7ef --- /dev/null +++ b/recipes-osmocom/osmo-ggsn/files/0001-libgtp-set-PDP_MAX-to-128.patch @@ -0,0 +1,34 @@ +From 2e0112520892b8f6a794c16bf3d025a7d10a89a5 Mon Sep 17 00:00:00 2001 +From: Oliver Smith <osmith@sysmocom.de> +Date: Wed, 2 Mar 2022 11:24:31 +0100 +Subject: [PATCH] libgtp: set PDP_MAX to 128 + +Reduce PDP_MAX and therefore QUEUE_SIZE (which is PDP_MAX * 2, see +gtp/queue.h). Harald explained why: + + libgtp statically allocates immensely large queues for packet + re-transmissions by default, way too much to run OsmoSGSN or + OpenGGSN/OsmoGGSN on the small ARM926EJS of sysmoBTS 1002. + +Related: https://gerrit.osmocom.org/c/meta-telephony/+/4092/2#message-8ec2174fac6c0bf3d9aab1270a7ebe06955d3bea +Change-Id: I97d5db8f2def4d628a6c4e67c27f07c7200b94d4 +--- + gtp/pdp.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gtp/pdp.h b/gtp/pdp.h +index 4dcdde46..9587f31e 100644 +--- a/gtp/pdp.h ++++ b/gtp/pdp.h +@@ -24,7 +24,7 @@ struct gsn_t; + #define LOGPDPX(ss, level, pdp, fmt, args...) \ + LOGP(ss, level, "PDP(%s:%u): " fmt, imsi_gtp2str(&(pdp)->imsi), (pdp)->nsapi, ## args) + +-#define PDP_MAX 1024 /* Max number of PDP contexts */ ++#define PDP_MAX 128 /* Max number of PDP contexts */ + #define PDP_MAXNSAPI 16 /* Max number of NSAPI */ + + #define PDP_EUA_ORG_IETF 0xF1 +-- +2.30.2 + diff --git a/recipes-osmocom/osmo-ggsn/files/libgtp-queue_depth_32.patch b/recipes-osmocom/osmo-ggsn/files/libgtp-queue_depth_32.patch deleted file mode 100644 index 52bc37b..0000000 --- a/recipes-osmocom/osmo-ggsn/files/libgtp-queue_depth_32.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/gtp/queue.h b/gtp/queue.h -index 556b6ef..d59a1a3 100644 ---- a/gtp/queue.h -+++ b/gtp/queue.h -@@ -19,7 +19,7 @@ - - #define QUEUE_DEBUG 0 /* Print debug information */ - --#define QUEUE_SIZE 1024 /* Size of retransmission queue */ -+#define QUEUE_SIZE 32 /* Size of retransmission queue */ - #define QUEUE_HASH_SIZE 65536 /* Size of hash table (2^16) */ - - struct qmsg_t { /* Holder for queued packets */ diff --git a/recipes-osmocom/osmo-ggsn/osmo-ggsn.inc b/recipes-osmocom/osmo-ggsn/osmo-ggsn.inc index 0aaf418..58b93f0 100644 --- a/recipes-osmocom/osmo-ggsn/osmo-ggsn.inc +++ b/recipes-osmocom/osmo-ggsn/osmo-ggsn.inc @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" DEPENDS = "libosmocore" -INC_PR="r2.${META_TELEPHONY_OSMO_INC}" +INC_PR="r3.${META_TELEPHONY_OSMO_INC}" inherit autotools pkgconfig systemd @@ -14,6 +14,12 @@ PACKAGECONFIG ??= "\ " PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir},--without-systemdsystemunitdir" +# StateDirectory requires systemd >= v235, but poky pyro ships with v232 (SYS#6340): +do_install_append() { + sed -i '/^StateDirectory=/d' "${D}${systemd_system_unitdir}/${PN}.service" + sed -i '/^WorkingDirectory=/d' "${D}${systemd_system_unitdir}/${PN}.service" +} + PACKAGES =+ " libgtp libgtp-dev libgtp-staticdev osmo-sgsnemu" RDEPENDS_${PN} += "iptables" RRECOMMENDS_${PN} += "kernel-module-ipt-masquerade kernel-module-tun" diff --git a/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb b/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb index b1b2298..60f19a4 100644 --- a/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb +++ b/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb @@ -1,9 +1,9 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "e71e0f2af84d8b26f4c09a8c859f86cf701b3357" -SRC_URI = "git://git.osmocom.org/osmo-ggsn \ - file://libgtp-queue_depth_32.patch \ +SRCREV = "1.10.2" +SRC_URI = "git://gerrit.osmocom.org/osmo-ggsn;protocol=https;tag=${SRCREV};nobranch=1 \ + file://0001-libgtp-set-PDP_MAX-to-128.patch \ " -PV = "1.5.0+gitr${SRCPV}" +PV = "1.10.2+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/osmo-hlr/osmo-hlr.inc b/recipes-osmocom/osmo-hlr/osmo-hlr.inc index 7fa415b..4229e7b 100644 --- a/recipes-osmocom/osmo-hlr/osmo-hlr.inc +++ b/recipes-osmocom/osmo-hlr/osmo-hlr.inc @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=73f1eb20517c55bf9493b7dd6e480788" DEPENDS = "libtalloc libosmocore libosmo-abis sqlite3 sqlite3-native" -INC_PR="r2.${META_TELEPHONY_OSMO_INC}" +INC_PR="r3.${META_TELEPHONY_OSMO_INC}" inherit autotools pkgconfig systemd @@ -17,6 +17,10 @@ do_compile_append() { do_install_append() { install -d ${D}${localstatedir}/lib/osmocom/ install -m 0644 ${WORKDIR}/hlr.db ${D}${localstatedir}/lib/osmocom/hlr.db + + # StateDirectory requires systemd >= v235, but poky pyro ships with v232 (SYS#6340): + sed -i '/^StateDirectory=/d' "${D}${systemd_system_unitdir}/${PN}.service" + sed -i '/^WorkingDirectory=/d' "${D}${systemd_system_unitdir}/${PN}.service" } PACKAGECONFIG ??= "\ @@ -38,6 +42,8 @@ FILES_osmo-hlr-utils = " \ ${bindir}/osmo-euse-demo \ " +FILES_${PN} =+ "${datadir}/osmocom/*" + SYSTEMD_SERVICE_${PN} = "${PN}.service" CONFFILES_osmo-hlr = "\ ${sysconfdir}/osmocom/osmo-hlr.cfg \ diff --git a/recipes-osmocom/osmo-hlr/osmo-hlr_git.bb b/recipes-osmocom/osmo-hlr/osmo-hlr_git.bb index 90bb611..80ed93a 100644 --- a/recipes-osmocom/osmo-hlr/osmo-hlr_git.bb +++ b/recipes-osmocom/osmo-hlr/osmo-hlr_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "3a66698d87b29e0bf8eb53ca29db7e0f02871abc" -SRC_URI = "git://git.osmocom.org/osmo-hlr.git;protocol=git" -PV = "1.2.0+gitr${SRCPV}" +SRCREV = "1.7.0" +SRC_URI = "git://gerrit.osmocom.org/osmo-hlr.git;protocol=https;tag=${SRCREV};nobranch=1" +PV = "1.7.0+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/osmo-hnbgw/osmo-hnbgw.inc b/recipes-osmocom/osmo-hnbgw/osmo-hnbgw.inc new file mode 100644 index 0000000..6bf01d3 --- /dev/null +++ b/recipes-osmocom/osmo-hnbgw/osmo-hnbgw.inc @@ -0,0 +1,28 @@ +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 osmo-mgw" + +INC_PR="r1.${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" + +do_install_append() { + sed -i '/^StateDirectory=/d' "${D}${systemd_system_unitdir}/${PN}.service" + sed -i '/^WorkingDirectory=/d' "${D}${systemd_system_unitdir}/${PN}.service" +} + +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..8c29259 --- /dev/null +++ b/recipes-osmocom/osmo-hnbgw/osmo-hnbgw_git.bb @@ -0,0 +1,7 @@ +require ${PN}.inc + +S = "${WORKDIR}/git" +SRCREV = "1.5.0" +SRC_URI = "git://gerrit.osmocom.org/osmo-hnbgw.git;protocol=https;tag=${SRCREV};nobranch=1" +PV = "1.5.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 ab412ad..a5674af 100644 --- a/recipes-osmocom/osmo-iuh/osmo-iuh.inc +++ b/recipes-osmocom/osmo-iuh/osmo-iuh.inc @@ -1,22 +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" +DEPENDS = "libosmocore libosmo-netif libosmo-sccp libasn1c lksctp-tools" -INC_PR="r1.${META_TELEPHONY_OSMO_INC}" +INC_PR="r3.${META_TELEPHONY_OSMO_INC}" -inherit autotools pkgconfig systemd +# 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" -PACKAGECONFIG ??= "\ - ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ - " -PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir},--without-systemdsystemunitdir" +inherit autotools pkgconfig -PACKAGES =+ "libosmo-ranap libosmo-ranap-dev osmo-hnbgw" -SYSTEMD_PACKAGES = "osmo-hnbgw" -SYSTEMD_SERVICE_osmo-hnbgw = "osmo-hnbgw.service" +PACKAGES =+ " \ + libosmo-hnbap libosmo-hnbap-dev \ + libosmo-ranap libosmo-ranap-dev \ + libosmo-rua libosmo-rua-dev \ + libosmo-sabp libosmo-sabp-dev \ + " + +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} \ @@ -28,10 +40,24 @@ FILES_libosmo-ranap-dev = " \ ${libdir}/libosmo-ranap${SOLIBSDEV} \ " -FILES_osmo-hnbgw = " \ - ${bindir}/osmo-hnbgw \ - ${sysconfdir}/osmocom/osmo-hnbgw.cfg \ +FILES_libosmo-rua = " \ + ${libdir}/libosmo-rua${SOLIBS} \ + " + +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} \ " -CONFFILES_osmo-hnbgw = "${sysconfdir}/osmocom/osmo-hnbgw.cfg" 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 66efd8c..0ec3b84 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 = "67d32a0386b1c0bfb7a12f63b5bb475a08010e80" -SRC_URI = "git://git.osmocom.org/osmo-iuh.git;protocol=git" -PV = "0.6.0+gitr${SRCPV}" +SRCREV = "1.5.0" +SRC_URI = "git://gerrit.osmocom.org/osmo-iuh.git;protocol=https;tag=${SRCREV};nobranch=1" +PV = "1.5.0+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/osmo-mgw/osmo-mgw.inc b/recipes-osmocom/osmo-mgw/osmo-mgw.inc index c00f998..a9a60b4 100644 --- a/recipes-osmocom/osmo-mgw/osmo-mgw.inc +++ b/recipes-osmocom/osmo-mgw/osmo-mgw.inc @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=73f1eb20517c55bf9493b7dd6e480788" DEPENDS = "libosmocore libosmo-netif" -INC_PR="r2.${META_TELEPHONY_OSMO_INC}" +INC_PR="r3.${META_TELEPHONY_OSMO_INC}" inherit autotools pkgconfig systemd @@ -14,6 +14,12 @@ PACKAGECONFIG ??= "\ " PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir},--without-systemdsystemunitdir" +# StateDirectory requires systemd >= v235, but poky pyro ships with v232 (SYS#6340): +do_install_append() { + sed -i '/^StateDirectory=/d' "${D}${systemd_system_unitdir}/${PN}.service" + sed -i '/^WorkingDirectory=/d' "${D}${systemd_system_unitdir}/${PN}.service" +} + PACKAGES =+ "libosmo-mgcp libosmo-mgcp-dev libosmo-mgcp-client libosmo-mgcp-client-dev" SYSTEMD_SERVICE_osmo-mgw = "osmo-mgw.service" diff --git a/recipes-osmocom/osmo-mgw/osmo-mgw_git.bb b/recipes-osmocom/osmo-mgw/osmo-mgw_git.bb index 14dd5c1..1bf7f30 100644 --- a/recipes-osmocom/osmo-mgw/osmo-mgw_git.bb +++ b/recipes-osmocom/osmo-mgw/osmo-mgw_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "ec45068972b85c6ace5483c5f533dae8e7975d41" -SRC_URI = "git://git.osmocom.org/osmo-mgw.git;protocol=git" -PV = "1.7.0+gitr${SRCPV}" +SRCREV = "1.12.0" +SRC_URI = "git://gerrit.osmocom.org/osmo-mgw.git;protocol=https;tag=${SRCREV};nobranch=1" +PV = "1.12.0+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/osmo-msc/osmo-msc.inc b/recipes-osmocom/osmo-msc/osmo-msc.inc index 59280ce..c60fd07 100644 --- a/recipes-osmocom/osmo-msc/osmo-msc.inc +++ b/recipes-osmocom/osmo-msc/osmo-msc.inc @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=73f1eb20517c55bf9493b7dd6e480788" DEPENDS = "libdbi libosmocore libosmo-abis libosmo-sccp libosmo-netif osmo-mgw osmo-hlr" -INC_PR="r2.${META_TELEPHONY_OSMO_INC}" +INC_PR="r3.${META_TELEPHONY_OSMO_INC}" inherit autotools pkgconfig systemd @@ -18,6 +18,12 @@ PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir}, PACKAGECONFIG[iu] = "--enable-iu,--disable-iu,libasn1c osmo-iuh," PACKAGECONFIG[smpp] = "--enable-smpp,--disable-smpp,libsmpp34," +# StateDirectory requires systemd >= v235, but poky pyro ships with v232 (SYS#6340): +do_install_append() { + sed -i '/^StateDirectory=/d' "${D}${systemd_system_unitdir}/${PN}.service" + sed -i '/^WorkingDirectory=/d' "${D}${systemd_system_unitdir}/${PN}.service" +} + RDEPENDS_${PN} = "libdbd-sqlite3" SYSTEMD_SERVICE_${PN} = "${PN}.service" diff --git a/recipes-osmocom/osmo-msc/osmo-msc_git.bb b/recipes-osmocom/osmo-msc/osmo-msc_git.bb index 2f11b66..b9ce89f 100644 --- a/recipes-osmocom/osmo-msc/osmo-msc_git.bb +++ b/recipes-osmocom/osmo-msc/osmo-msc_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "6a0c4d9d24f7a591018898459b8767c6d1447309" -SRC_URI = "git://git.osmocom.org/osmo-msc.git;protocol=git" -PV = "1.6.0+gitr${SRCPV}" +SRCREV = "1.11.0" +SRC_URI = "git://gerrit.osmocom.org/osmo-msc.git;protocol=https;tag=${SRCREV};nobranch=1" +PV = "1.11.0+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/osmo-pcap/osmo-pcap.inc b/recipes-osmocom/osmo-pcap/osmo-pcap.inc index a7d3a60..3f39103 100644 --- a/recipes-osmocom/osmo-pcap/osmo-pcap.inc +++ b/recipes-osmocom/osmo-pcap/osmo-pcap.inc @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=73f1eb20517c55bf9493b7dd6e480788" DEPENDS = "libosmocore zeromq libpcap gnutls" -INC_PR="r0.${META_TELEPHONY_OSMO_INC}" +INC_PR="r1.${META_TELEPHONY_OSMO_INC}" inherit autotools pkgconfig systemd @@ -14,6 +14,14 @@ PACKAGECONFIG ??= "\ " PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir},--without-systemdsystemunitdir" +# StateDirectory requires systemd >= v235, but poky pyro ships with v232 (SYS#6340): +do_install_append() { + sed -i '/^StateDirectory=/d' "${D}${systemd_system_unitdir}/osmo-pcap-server.service" + sed -i '/^WorkingDirectory=/d' "${D}${systemd_system_unitdir}/osmo-pcap-server.service" + sed -i '/^StateDirectory=/d' "${D}${systemd_system_unitdir}/osmo-pcap-client.service" + sed -i '/^WorkingDirectory=/d' "${D}${systemd_system_unitdir}/osmo-pcap-client.service" +} + PACKAGES =+ "osmo-pcap-server osmo-pcap-client" SYSTEMD_PACKAGES = "osmo-pcap-server osmo-pcap-client" diff --git a/recipes-osmocom/osmo-pcap/osmo-pcap_git.bb b/recipes-osmocom/osmo-pcap/osmo-pcap_git.bb index dd25b50..149f026 100644 --- a/recipes-osmocom/osmo-pcap/osmo-pcap_git.bb +++ b/recipes-osmocom/osmo-pcap/osmo-pcap_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "d8368cebf8ca159c38027e4cb9109f9f0bcd0a46" -SRC_URI = "git://git.osmocom.org/osmo-pcap.git;protocol=git" -PV = "0.1.2+gitr${SRCPV}" +SRCREV = "0.4.2" +SRC_URI = "git://gerrit.osmocom.org/osmo-pcap.git;protocol=https;tag=${SRCREV};nobranch=1" +PV = "0.4.2+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/osmo-sgsn/osmo-sgsn.inc b/recipes-osmocom/osmo-sgsn/osmo-sgsn.inc index 57ab845..9463047 100644 --- a/recipes-osmocom/osmo-sgsn/osmo-sgsn.inc +++ b/recipes-osmocom/osmo-sgsn/osmo-sgsn.inc @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=73f1eb20517c55bf9493b7dd6e480788" DEPENDS = "c-ares libosmocore libosmo-netif osmo-ggsn osmo-hlr" -INC_PR="r1.${META_TELEPHONY_OSMO_INC}" +INC_PR="r2.${META_TELEPHONY_OSMO_INC}" inherit autotools pkgconfig systemd @@ -16,25 +16,25 @@ PACKAGECONFIG ??= "\ PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir},--without-systemdsystemunitdir" PACKAGECONFIG[iu] = "--enable-iu,--disable-iu,libasn1c libosmo-sccp osmo-iuh," -PACKAGES =+ "osmo-gbproxy-doc osmo-gtphub-doc osmo-gbproxy osmo-gtphub" -SYSTEMD_PACKAGES = "osmo-sgsn osmo-gbproxy osmo-gtphub" +# StateDirectory requires systemd >= v235, but poky pyro ships with v232 (SYS#6340): +do_install_append() { + sed -i '/^StateDirectory=/d' "${D}${systemd_system_unitdir}/osmo-sgsn.service" + sed -i '/^WorkingDirectory=/d' "${D}${systemd_system_unitdir}/osmo-sgsn.service" + sed -i '/^StateDirectory=/d' "${D}${systemd_system_unitdir}/osmo-gtphub.service" + sed -i '/^WorkingDirectory=/d' "${D}${systemd_system_unitdir}/osmo-gtphub.service" +} + +PACKAGES =+ "osmo-gtphub-doc osmo-gtphub" +SYSTEMD_PACKAGES = "osmo-sgsn osmo-gtphub" SYSTEMD_SERVICE_osmo-sgsn = "osmo-sgsn.service" -SYSTEMD_SERVICE_osmo-gbproxy = "osmo-gbproxy.service" SYSTEMD_SERVICE_osmo-gtphub = "osmo-gtphub.service" CONFFILES_osmo-sgsn = "${sysconfdir}/osmocom/osmo-sgsn.cfg" -FILES_osmo-gbproxy = " \ - ${bindir}/osmo-gbproxy \ - ${sysconfdir}/osmocom/osmo-gbproxy.cfg \ - " -CONFFILES_osmo-gbproxy = "${sysconfdir}/osmocom/osmo-gbproxy.cfg" - FILES_osmo-gtphub = " \ ${bindir}/osmo-gtphub \ ${sysconfdir}/osmocom/osmo-gtphub.cfg \ " CONFFILES_osmo-gtphub = "${sysconfdir}/osmocom/osmo-gtphub.cfg" -FILES_osmo-gbproxy-doc = " ${docdir}/osmo-sgsn/examples/osmo-gbproxy " FILES_osmo-gtphub-doc = " ${docdir}/osmo-sgsn/examples/osmo-gtphub " diff --git a/recipes-osmocom/osmo-sgsn/osmo-sgsn_git.bb b/recipes-osmocom/osmo-sgsn/osmo-sgsn_git.bb index f0aa365..c506263 100644 --- a/recipes-osmocom/osmo-sgsn/osmo-sgsn_git.bb +++ b/recipes-osmocom/osmo-sgsn/osmo-sgsn_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "394aa533e9e3a744dfe10c2cf01898dabb8d6812" -SRC_URI = "git://git.osmocom.org/osmo-sgsn.git;protocol=git" -PV = "1.6.0+gitr${SRCPV}" +SRCREV = "1.11.0" +SRC_URI = "git://gerrit.osmocom.org/osmo-sgsn.git;protocol=https;tag=${SRCREV};nobranch=1" +PV = "1.11.0+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/osmo-sip-connector/osmo-sip-connector.inc b/recipes-osmocom/osmo-sip-connector/osmo-sip-connector.inc index 96d3734..7aabf20 100644 --- a/recipes-osmocom/osmo-sip-connector/osmo-sip-connector.inc +++ b/recipes-osmocom/osmo-sip-connector/osmo-sip-connector.inc @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=ccdfc45f78d625db70e70ede679d5ce3" DEPENDS = "sofia-sip libosmocore" -INC_PR="r1.${META_TELEPHONY_OSMO_INC}" +INC_PR="r2.${META_TELEPHONY_OSMO_INC}" inherit autotools pkgconfig systemd @@ -14,6 +14,11 @@ PACKAGECONFIG ??= "\ " PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir},--without-systemdsystemunitdir" +# StateDirectory requires systemd >= v235, but poky pyro ships with v232 (SYS#6340): +do_install_append() { + sed -i '/^StateDirectory=/d' "${D}${systemd_system_unitdir}/${PN}.service" + sed -i '/^WorkingDirectory=/d' "${D}${systemd_system_unitdir}/${PN}.service" +} SYSTEMD_SERVICE_${PN} = "${PN}.service" CONFFILES_osmo-sip-connector = "${sysconfdir}/osmocom/osmo-sip-connector.cfg" diff --git a/recipes-osmocom/osmo-sip-connector/osmo-sip-connector_git.bb b/recipes-osmocom/osmo-sip-connector/osmo-sip-connector_git.bb index 5d525ae..678e591 100644 --- a/recipes-osmocom/osmo-sip-connector/osmo-sip-connector_git.bb +++ b/recipes-osmocom/osmo-sip-connector/osmo-sip-connector_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "e58ead7ac4c0e97f82ceef828b8da30f7cb84927" -SRC_URI = "git://git.osmocom.org/osmo-sip-connector.git;protocol=git" -PV = "1.4.0+gitr${SRCPV}" +SRCREV = "1.6.3" +SRC_URI = "git://gerrit.osmocom.org/osmo-sip-connector.git;protocol=https;tag=${SRCREV};nobranch=1" +PV = "1.6.3+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/osmo-sysmon/osmo-sysmon_git.bb b/recipes-osmocom/osmo-sysmon/osmo-sysmon_git.bb index 32796b3..708f783 100644 --- a/recipes-osmocom/osmo-sysmon/osmo-sysmon_git.bb +++ b/recipes-osmocom/osmo-sysmon/osmo-sysmon_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "7648a0eb1824e432075353cde10dffdac1cd295e" -SRC_URI = "git://git.osmocom.org/osmo-sysmon.git;protocol=git" -PV = "0.2.0+gitr${SRCPV}" +SRCREV = "0.3.2" +SRC_URI = "git://gerrit.osmocom.org/osmo-sysmon.git;protocol=https;tag=${SRCREV};nobranch=1" +PV = "0.3.2+gitr${SRCPV}" PR = "${INC_PR}.0" |