From a254220540bd264ccc1b43b275fae0bcde07a866 Mon Sep 17 00:00:00 2001
From: Alexandre Bard <alexandre.bard@netmodule.com>
Date: Thu, 31 Dec 2020 12:01:21 +0100
Subject: [PATCH] ModemManager: Update to 1.14.8

 - Backport 1.14.8 recipe from meta-oe/master
 - Update our internal git repo
 - Use new feature to exclude unused plugins

BugzID: 60585
---
 ...anager_1.10.8.bb => modemmanager_1.14.8.bb} | 18 +++++++++---------
 ...mmanager_%.bbappend => modemmanager_git.bb} | 15 ++++++++++++---
 2 files changed, 21 insertions(+), 12 deletions(-)
 rename recipes-connectivity/modemmanager/{modemmanager_1.10.8.bb => modemmanager_1.14.8.bb} (85%)
 rename recipes-connectivity/modemmanager/{modemmanager_%.bbappend => modemmanager_git.bb} (59%)

diff --git a/recipes-connectivity/modemmanager/modemmanager_1.10.8.bb b/recipes-connectivity/modemmanager/modemmanager_1.14.8.bb
similarity index 85%
rename from recipes-connectivity/modemmanager/modemmanager_1.10.8.bb
rename to recipes-connectivity/modemmanager/modemmanager_1.14.8.bb
index d3f96c2..57605a7 100644
--- a/recipes-connectivity/modemmanager/modemmanager_1.10.8.bb
+++ b/recipes-connectivity/modemmanager/modemmanager_1.14.8.bb
@@ -1,3 +1,5 @@
+# NB: backport from meta-oe/master
+
 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/"
@@ -11,18 +13,16 @@ inherit gnomebase gettext systemd vala gobject-introspection bash-completion
 
 DEPENDS = "glib-2.0 libgudev intltool-native libxslt-native"
 
-SRC_URI = "http://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz \
-           "
-
-SRC_URI[md5sum] = "c05ac4246c81cc15d617c4a129232988"
-SRC_URI[sha256sum] = "cbe174078dbdf3f746a55f0004353d3c27da2a31da553036d90fc7dc34a0169a"
-
+SRC_URI = "http://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz"
+SRC_URI[sha256sum] = "fe1a26ba51b4bda7abd09ad4dadedd87d8b8154809fc9d88e94f75fdfff19295"
 S = "${WORKDIR}/ModemManager-${PV}"
 
-PACKAGECONFIG ??= "mbim \
+PACKAGECONFIG = "systemd"
+PACKAGECONFIG ??= "mbim qmi \
     ${@bb.utils.filter('DISTRO_FEATURES', 'systemd polkit', d)} \
 "
 
+PACKAGECONFIG[at] = "--with-at-command-via-dbus"
 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.
@@ -33,15 +33,14 @@ PACKAGECONFIG[qmi] = "--with-qmi,--without-qmi,libqmi"
 EXTRA_OECONF = " \
     --with-udev-base-dir=${nonarch_base_libdir}/udev \
 "
-EXTRA_OECONF_append_toolchain-clang = " --enable-more-warnings=no"
 
 FILES_${PN} += " \
     ${datadir}/icons \
     ${datadir}/polkit-1 \
     ${datadir}/dbus-1 \
+    ${datadir}/ModemManager \
     ${libdir}/ModemManager \
     ${systemd_unitdir}/system \
-	/usr/share \
 "
 
 FILES_${PN}-dev += " \
@@ -55,3 +54,4 @@ FILES_${PN}-staticdev += " \
 FILES_${PN}-dbg += "${libdir}/ModemManager/.debug"
 
 SYSTEMD_SERVICE_${PN} = "ModemManager.service"
+
diff --git a/recipes-connectivity/modemmanager/modemmanager_%.bbappend b/recipes-connectivity/modemmanager/modemmanager_git.bb
similarity index 59%
rename from recipes-connectivity/modemmanager/modemmanager_%.bbappend
rename to recipes-connectivity/modemmanager/modemmanager_git.bb
index 3c1bb88..987a00c 100644
--- a/recipes-connectivity/modemmanager/modemmanager_%.bbappend
+++ b/recipes-connectivity/modemmanager/modemmanager_git.bb
@@ -1,10 +1,18 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+require recipes-connectivity/modemmanager/modemmanager_1.14.8.bb
 
-SRC_URI = "git://gitlab.com/netmodule/third-party/ModemManager;protocol=ssh;user=git;branch=mm-1-10-netmodule;"
+# Use custom git repo as SRC
+SRC_URI = "git://gitlab.com/netmodule/third-party/ModemManager;protocol=ssh;user=git;branch=mm-1-14-netmodule;"
 SRCREV = "${AUTOREV}"
-
 S = "${WORKDIR}/git"
 
+# Keep only ublox plugin
+EXTRA_OECONF += "--disable-all-plugins --enable-plugin-ublox"
+
+# Exclude mbim and qmi
+PACKAGECONFIG = "systemd"
+
+# Add whitelist rules
+FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
 SRC_URI += "file://77-mm-netmodule-whitelist.rules"
 
 do_install_append() {
@@ -12,4 +20,5 @@ do_install_append() {
     sed -i -e 's/bin\/ModemManager/bin\/ModemManager --filter-policy=WHITELIST-ONLY/g' ${D}${systemd_unitdir}/system/ModemManager.service
 }
 
+# MM is started by wwan-config
 SYSTEMD_AUTO_ENABLE = "disable"