From 42ab6b30ec52a12a6b9ce1c661d126a66b9ded9c Mon Sep 17 00:00:00 2001 From: Adrian Bunk Date: Sun, 21 Oct 2018 17:34:24 +0300 Subject: modemmanager: Upgrade to 1.8.2 Obsolete patch dropped, upstream solved this differently: Use realpath() instead of canonicalize_filename(), fixing build with musl libc. Signed-off-by: Adrian Bunk Signed-off-by: Khem Raj --- ...re-check-for-canonicalize_file_name-befor.patch | 66 ---------------------- .../modemmanager/modemmanager_1.7.991.bb | 52 ----------------- .../modemmanager/modemmanager_1.8.2.bb | 51 +++++++++++++++++ 3 files changed, 51 insertions(+), 118 deletions(-) delete mode 100644 meta-oe/recipes-connectivity/modemmanager/modemmanager/0001-Add-configure-check-for-canonicalize_file_name-befor.patch delete mode 100644 meta-oe/recipes-connectivity/modemmanager/modemmanager_1.7.991.bb create mode 100644 meta-oe/recipes-connectivity/modemmanager/modemmanager_1.8.2.bb (limited to 'meta-oe/recipes-connectivity') diff --git a/meta-oe/recipes-connectivity/modemmanager/modemmanager/0001-Add-configure-check-for-canonicalize_file_name-befor.patch b/meta-oe/recipes-connectivity/modemmanager/modemmanager/0001-Add-configure-check-for-canonicalize_file_name-befor.patch deleted file mode 100644 index f3cf3d639b..0000000000 --- a/meta-oe/recipes-connectivity/modemmanager/modemmanager/0001-Add-configure-check-for-canonicalize_file_name-befor.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 07f1eda630517816bfa900e811963745a149e57c Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 8 Jun 2018 20:38:30 -0700 -Subject: [PATCH] Add configure check for canonicalize_file_name() before use - -Define canonicalize_file_name API if not provided by system C library -musl e.g. does not provide this API - -Signed-off-by: Khem Raj ---- -Upstream-Status: Pending - - configure.ac | 2 ++ - src/kerneldevice/mm-kernel-device-generic.c | 18 ++++++++++++++++++ - 2 files changed, 20 insertions(+) - -Index: ModemManager-1.7.991/configure.ac -=================================================================== ---- ModemManager-1.7.991.orig/configure.ac -+++ ModemManager-1.7.991/configure.ac -@@ -72,6 +72,8 @@ AC_SUBST(MM_GLIB_LT_CURRENT) - AC_SUBST(MM_GLIB_LT_REVISION) - AC_SUBST(MM_GLIB_LT_AGE) - -+AC_CHECK_FUNCS([canonicalize_file_name]) -+ - dnl----------------------------------------------------------------------------- - dnl Documentation - dnl -Index: ModemManager-1.7.991/src/kerneldevice/mm-kernel-device-generic.c -=================================================================== ---- ModemManager-1.7.991.orig/src/kerneldevice/mm-kernel-device-generic.c -+++ ModemManager-1.7.991/src/kerneldevice/mm-kernel-device-generic.c -@@ -21,6 +21,7 @@ - #define _LIBMM_INSIDE_MM - #include - -+#include "config.h" - #include "mm-kernel-device-generic.h" - #include "mm-kernel-device-generic-rules.h" - #include "mm-log.h" -@@ -100,6 +101,24 @@ read_sysfs_property_as_string (const gch - return contents; - } - -+#ifndef HAVE_CANONICALIZE_FILE_NAME -+#include -+#include -+#include -+#include -+static char * canonicalize_file_name(const char *path) -+{ -+ char buf[PATH_MAX] = { }; -+ -+ snprintf(buf, sizeof(buf) - 1, "%s", path); -+ -+ if (!realpath(path, buf)) -+ return NULL; -+ -+ return strdup(buf); -+} -+#endif -+ - /*****************************************************************************/ - /* Load contents */ - diff --git a/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.7.991.bb b/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.7.991.bb deleted file mode 100644 index 26b56d17d0..0000000000 --- a/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.7.991.bb +++ /dev/null @@ -1,52 +0,0 @@ -SUMMARY = "ModemManager is a daemon controlling broadband devices/connections" -DESCRIPTION = "ModemManager is a DBus-activated daemon which controls mobile broadband (2G/3G/4G) devices and connections" -HOMEPAGE = "http://www.freedesktop.org/wiki/Software/ModemManager/" -LICENSE = "GPL-2.0 & LGPL-2.1" -LIC_FILES_CHKSUM = " \ - file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \ -" - -inherit gnomebase gettext systemd vala gobject-introspection bash-completion - -DEPENDS = "glib-2.0 libgudev dbus-glib intltool-native" - -SRC_URI = "http://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz \ - file://0001-Add-configure-check-for-canonicalize_file_name-befor.patch \ - " - -SRC_URI[md5sum] = "4efe6a240cef212bf8855c95424e7c7f" -SRC_URI[sha256sum] = "4e366243bd4983f2e6efe35cb901cf5da51939307b5d6299fe622a9fcf411745" - -S = "${WORKDIR}/ModemManager-${PV}" - -PACKAGECONFIG ??= "mbim qmi polkit \ - ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ -" - -PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/,," -PACKAGECONFIG[polkit] = "--with-polkit=yes,--with-polkit=no,polkit" -# Support WWAN modems and devices which speak the Mobile Interface Broadband Model (MBIM) protocol. -PACKAGECONFIG[mbim] = "--with-mbim,--with-mbim=no,libmbim" -# Support WWAN modems and devices which speak the Qualcomm MSM Interface (QMI) protocol. -PACKAGECONFIG[qmi] = "--with-qmi,--without-qmi,libqmi" - -FILES_${PN} += " \ - ${datadir}/icons \ - ${datadir}/polkit-1 \ - ${datadir}/dbus-1 \ - ${libdir}/ModemManager \ - ${systemd_unitdir}/system \ -" - -FILES_${PN}-dev += " \ - ${libdir}/ModemManager/*.la \ -" - -FILES_${PN}-staticdev += " \ - ${libdir}/ModemManager/*.a \ -" - -FILES_${PN}-dbg += "${libdir}/ModemManager/.debug" - -SYSTEMD_SERVICE_${PN} = "ModemManager.service" diff --git a/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.8.2.bb b/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.8.2.bb new file mode 100644 index 0000000000..82e3178bd1 --- /dev/null +++ b/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.8.2.bb @@ -0,0 +1,51 @@ +SUMMARY = "ModemManager is a daemon controlling broadband devices/connections" +DESCRIPTION = "ModemManager is a DBus-activated daemon which controls mobile broadband (2G/3G/4G) devices and connections" +HOMEPAGE = "http://www.freedesktop.org/wiki/Software/ModemManager/" +LICENSE = "GPL-2.0 & LGPL-2.1" +LIC_FILES_CHKSUM = " \ + file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \ +" + +inherit gnomebase gettext systemd vala gobject-introspection bash-completion + +DEPENDS = "glib-2.0 libgudev dbus-glib intltool-native" + +SRC_URI = "http://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz \ + " + +SRC_URI[md5sum] = "a49c9f73e46c7b89e5efedda250d22c0" +SRC_URI[sha256sum] = "96f2a5f0ed15532b4c4c185b756fdc0326e7c2027cea26a1264f91e098260f80" + +S = "${WORKDIR}/ModemManager-${PV}" + +PACKAGECONFIG ??= "mbim qmi polkit \ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ +" + +PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/,," +PACKAGECONFIG[polkit] = "--with-polkit=yes,--with-polkit=no,polkit" +# Support WWAN modems and devices which speak the Mobile Interface Broadband Model (MBIM) protocol. +PACKAGECONFIG[mbim] = "--with-mbim,--with-mbim=no,libmbim" +# Support WWAN modems and devices which speak the Qualcomm MSM Interface (QMI) protocol. +PACKAGECONFIG[qmi] = "--with-qmi,--without-qmi,libqmi" + +FILES_${PN} += " \ + ${datadir}/icons \ + ${datadir}/polkit-1 \ + ${datadir}/dbus-1 \ + ${libdir}/ModemManager \ + ${systemd_unitdir}/system \ +" + +FILES_${PN}-dev += " \ + ${libdir}/ModemManager/*.la \ +" + +FILES_${PN}-staticdev += " \ + ${libdir}/ModemManager/*.a \ +" + +FILES_${PN}-dbg += "${libdir}/ModemManager/.debug" + +SYSTEMD_SERVICE_${PN} = "ModemManager.service" -- cgit 1.2.3-korg