From d5123a2564d507175e5e34772bf5da760c495a87 Mon Sep 17 00:00:00 2001 From: Martin Hundeb?ll Date: Wed, 22 May 2024 11:03:50 +0200 Subject: ofono: upgrade 2.4 -> 2.7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Remove 0001-mbim-add-an-optional-TEMP_FAILURE_RETRY-macro-copy.patch as TEMP_FAILURE_RETRY usage has been removed in upstream commit 765c6655 ("treewide: Use L_TFR macro"). Remove 0002-mbim-Fix-build-with-ell-0.39-by-restoring-unlikely-m.patch as likely()/unlikely() has been removed in upstream commit dbbbebf9 ("mbimmodem: Remove usage of likely and unlikely"). Remove the do_configure:prepend() that purges the bundled ell directory, as it isn't needed when passing --enable-external-ell in EXTRA_OECONF. (From OE-Core rev: 9e018a52ab325dd15f129666fcf8a728fc7c7ec0) Signed-off-by: Martin Hundebøll Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- ...an-optional-TEMP_FAILURE_RETRY-macro-copy.patch | 36 -------------- ...ild-with-ell-0.39-by-restoring-unlikely-m.patch | 28 ----------- meta/recipes-connectivity/ofono/ofono_2.4.bb | 55 ---------------------- meta/recipes-connectivity/ofono/ofono_2.7.bb | 48 +++++++++++++++++++ 4 files changed, 48 insertions(+), 119 deletions(-) delete mode 100644 meta/recipes-connectivity/ofono/ofono/0001-mbim-add-an-optional-TEMP_FAILURE_RETRY-macro-copy.patch delete mode 100644 meta/recipes-connectivity/ofono/ofono/0002-mbim-Fix-build-with-ell-0.39-by-restoring-unlikely-m.patch delete mode 100644 meta/recipes-connectivity/ofono/ofono_2.4.bb create mode 100644 meta/recipes-connectivity/ofono/ofono_2.7.bb diff --git a/meta/recipes-connectivity/ofono/ofono/0001-mbim-add-an-optional-TEMP_FAILURE_RETRY-macro-copy.patch b/meta/recipes-connectivity/ofono/ofono/0001-mbim-add-an-optional-TEMP_FAILURE_RETRY-macro-copy.patch deleted file mode 100644 index 8a5a300adc..0000000000 --- a/meta/recipes-connectivity/ofono/ofono/0001-mbim-add-an-optional-TEMP_FAILURE_RETRY-macro-copy.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 22b52db4842611ac31a356f023fc09595384e2ad Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Thu, 23 May 2019 18:11:22 -0700 -Subject: [PATCH] mbim: add an optional TEMP_FAILURE_RETRY macro copy - -Fixes build on musl which does not provide this macro - -Upstream-Status: Submitted [https://lists.ofono.org/pipermail/ofono/2019-May/019370.html] -Signed-off-by: Khem Raj ---- - drivers/mbimmodem/mbim-private.h | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/drivers/mbimmodem/mbim-private.h b/drivers/mbimmodem/mbim-private.h -index e159235..51693ea 100644 ---- a/drivers/mbimmodem/mbim-private.h -+++ b/drivers/mbimmodem/mbim-private.h -@@ -21,6 +21,15 @@ - - #define align_len(len, boundary) (((len)+(boundary)-1) & ~((boundary)-1)) - -+#ifndef TEMP_FAILURE_RETRY -+#define TEMP_FAILURE_RETRY(expression) ({ \ -+ __typeof(expression) __result; \ -+ do { \ -+ __result = (expression); \ -+ } while (__result == -1 && errno == EINTR); \ -+ __result; }) -+#endif -+ - enum mbim_control_message { - MBIM_OPEN_MSG = 0x1, - MBIM_CLOSE_MSG = 0x2, --- -2.21.0 - diff --git a/meta/recipes-connectivity/ofono/ofono/0002-mbim-Fix-build-with-ell-0.39-by-restoring-unlikely-m.patch b/meta/recipes-connectivity/ofono/ofono/0002-mbim-Fix-build-with-ell-0.39-by-restoring-unlikely-m.patch deleted file mode 100644 index 3655b3fd66..0000000000 --- a/meta/recipes-connectivity/ofono/ofono/0002-mbim-Fix-build-with-ell-0.39-by-restoring-unlikely-m.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 76e4054801350ebd4a44057379431a33d460ad0f Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Wed, 21 Apr 2021 11:01:34 +0000 -Subject: [PATCH] mbim: Fix build with ell-0.39 by restoring unlikely macro - from ell/util.h - -Upstream-Status: Pending - -Signed-off-by: Martin Jansa ---- - drivers/mbimmodem/mbim-private.h | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/drivers/mbimmodem/mbim-private.h b/drivers/mbimmodem/mbim-private.h -index 51693eae..d917312c 100644 ---- a/drivers/mbimmodem/mbim-private.h -+++ b/drivers/mbimmodem/mbim-private.h -@@ -30,6 +30,10 @@ - __result; }) - #endif - -+/* used to be part of ell/util.h before 0.39: -+ https://git.kernel.org/pub/scm/libs/ell/ell.git/commit/?id=2a682421b06e41c45098217a686157f576847021 */ -+#define unlikely(x) __builtin_expect(!!(x), 0) -+ - enum mbim_control_message { - MBIM_OPEN_MSG = 0x1, - MBIM_CLOSE_MSG = 0x2, diff --git a/meta/recipes-connectivity/ofono/ofono_2.4.bb b/meta/recipes-connectivity/ofono/ofono_2.4.bb deleted file mode 100644 index 5e1e5f3b6a..0000000000 --- a/meta/recipes-connectivity/ofono/ofono_2.4.bb +++ /dev/null @@ -1,55 +0,0 @@ -SUMMARY = "open source telephony" -DESCRIPTION = "oFono is a stack for mobile telephony devices on Linux. oFono supports speaking to telephony devices through specific drivers, or with generic AT commands." -HOMEPAGE = "http://www.ofono.org" -BUGTRACKER = "https://01.org/jira/browse/OF" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \ - file://src/ofono.h;beginline=1;endline=20;md5=3ce17d5978ef3445def265b98899c2ee" -DEPENDS = "dbus glib-2.0 udev mobile-broadband-provider-info ell" - -SRC_URI = "\ - ${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \ - file://ofono \ - file://0001-mbim-add-an-optional-TEMP_FAILURE_RETRY-macro-copy.patch \ - file://0002-mbim-Fix-build-with-ell-0.39-by-restoring-unlikely-m.patch \ -" -SRC_URI[sha256sum] = "93580adc1afd1890dc516efb069de0c5cdfef014415256ddfb28ab172df2d11d" - -inherit autotools pkgconfig update-rc.d systemd gobject-introspection-data - -INITSCRIPT_NAME = "ofono" -INITSCRIPT_PARAMS = "defaults 22" -SYSTEMD_SERVICE:${PN} = "ofono.service" - -PACKAGECONFIG ??= "\ - ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \ -" -PACKAGECONFIG[systemd] = "--with-systemdunitdir=${systemd_system_unitdir}/,--with-systemdunitdir=" -PACKAGECONFIG[bluez] = "--enable-bluetooth, --disable-bluetooth, bluez5" - -EXTRA_OECONF += "--enable-test --enable-external-ell" - -do_configure:prepend() { - bbnote "Removing bundled ell from ${S}/ell to prevent including it" - rm -rf ${S}/ell -} - -do_install:append() { - install -d ${D}${sysconfdir}/init.d/ - install -m 0755 ${UNPACKDIR}/ofono ${D}${sysconfdir}/init.d/ofono -} - -PACKAGES =+ "${PN}-tests" - -FILES:${PN} += "${systemd_unitdir}" -FILES:${PN}-tests = "${libdir}/${BPN}/test" - -RDEPENDS:${PN} += "dbus" -RDEPENDS:${PN}-tests = "\ - python3-core \ - python3-dbus \ - ${@bb.utils.contains('GI_DATA_ENABLED', 'True', 'python3-pygobject', '', d)} \ -" - -RRECOMMENDS:${PN} += "kernel-module-tun mobile-broadband-provider-info" diff --git a/meta/recipes-connectivity/ofono/ofono_2.7.bb b/meta/recipes-connectivity/ofono/ofono_2.7.bb new file mode 100644 index 0000000000..bc1f3efd04 --- /dev/null +++ b/meta/recipes-connectivity/ofono/ofono_2.7.bb @@ -0,0 +1,48 @@ +SUMMARY = "open source telephony" +DESCRIPTION = "oFono is a stack for mobile telephony devices on Linux. oFono supports speaking to telephony devices through specific drivers, or with generic AT commands." +HOMEPAGE = "http://www.ofono.org" +BUGTRACKER = "https://01.org/jira/browse/OF" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \ + file://src/ofono.h;beginline=1;endline=20;md5=3ce17d5978ef3445def265b98899c2ee" +DEPENDS = "dbus glib-2.0 udev mobile-broadband-provider-info ell" + +SRC_URI = "\ + ${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \ + file://ofono \ +" +SRC_URI[sha256sum] = "dabf6ef06b94beaad65253200abe3887046a4e722f4fe373c4264f357ae47ad3" + +inherit autotools pkgconfig update-rc.d systemd gobject-introspection-data + +INITSCRIPT_NAME = "ofono" +INITSCRIPT_PARAMS = "defaults 22" +SYSTEMD_SERVICE:${PN} = "ofono.service" + +PACKAGECONFIG ??= "\ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \ +" +PACKAGECONFIG[systemd] = "--with-systemdunitdir=${systemd_system_unitdir}/,--with-systemdunitdir=" +PACKAGECONFIG[bluez] = "--enable-bluetooth, --disable-bluetooth, bluez5" + +EXTRA_OECONF += "--enable-test --enable-external-ell" + +do_install:append() { + install -d ${D}${sysconfdir}/init.d/ + install -m 0755 ${UNPACKDIR}/ofono ${D}${sysconfdir}/init.d/ofono +} + +PACKAGES =+ "${PN}-tests" + +FILES:${PN} += "${systemd_unitdir}" +FILES:${PN}-tests = "${libdir}/${BPN}/test" + +RDEPENDS:${PN} += "dbus" +RDEPENDS:${PN}-tests = "\ + python3-core \ + python3-dbus \ + ${@bb.utils.contains('GI_DATA_ENABLED', 'True', 'python3-pygobject', '', d)} \ +" + +RRECOMMENDS:${PN} += "kernel-module-tun mobile-broadband-provider-info" -- cgit v1.2.3-54-g00ecf