diff --git a/layers/meta-balena-imx8mm/conf/layer.conf b/layers/meta-balena-imx8mm/conf/layer.conf
index 3f86d42a..80430dbd 100644
--- a/layers/meta-balena-imx8mm/conf/layer.conf
+++ b/layers/meta-balena-imx8mm/conf/layer.conf
@@ -28,13 +28,6 @@ BBMASK += "meta-compulab/recipes-desktop"
 BBMASK += "meta-compulab/classes/compulab.bbclass"
 BBMASK += "meta-bsp-imx8mm/recipes-bsp/recipes-images"
 
-# These need to be masked until the MM update PR is merged
-# in meta-balena and we can drop the existing update files in this
-# repository
-BBMASK += "meta-balena/meta-balena-common/recipes-connectivity/modemmanager"
-BBMASK += "meta-balena/meta-balena-common/recipes-connectivity/libqmi"
-BBMASK += "meta-balena/meta-balena-common/recipes-connectivity/libmbim"
-
 # These should be removed once the Modemmanager update
 # is merged in meta-balena
 PREFERRED_VERSION:libmbim = "1.28.4"
diff --git a/layers/meta-balena-imx8mm/recipes-connectivity/libmbim/libmbim/clang.patch b/layers/meta-balena-imx8mm/recipes-connectivity/libmbim/libmbim/clang.patch
deleted file mode 100644
index 74872c1e..00000000
--- a/layers/meta-balena-imx8mm/recipes-connectivity/libmbim/libmbim/clang.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From a5a83490a162ebadee06814338215e001197a70b Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 1 Sep 2017 17:01:15 +0100
-Subject: [PATCH] libqmi: Update to 1.16.0
-
-Check for clang compiler since we need to disable
-unused-function warning for clang, at same time
-pass werror when checking for compiler options if
-werror is enabled so spurious options do not get
-enabled. Only the ones that are supported by given
-compiler are accepted.
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Upstream-Status: Pending
-
----
- m4/compiler-warnings.m4 | 29 +++++++++++++++++++++++++----
- 1 file changed, 25 insertions(+), 4 deletions(-)
-
-diff --git a/m4/compiler-warnings.m4 b/m4/compiler-warnings.m4
-index 77b79c5..b132a29 100644
---- a/m4/compiler-warnings.m4
-+++ b/m4/compiler-warnings.m4
-@@ -2,10 +2,30 @@ AC_DEFUN([LIBMBIM_COMPILER_WARNINGS],
- [AC_ARG_ENABLE(more-warnings,
- 	AS_HELP_STRING([--enable-more-warnings], [Possible values: no/yes/error]),
- 	set_more_warnings="$enableval",set_more_warnings=error)
-+
-+# Clang throws a lot of warnings when it does not understand a flag. Disable
-+# this warning for now so other warnings are visible.
-+AC_MSG_CHECKING([if compiling with clang])
-+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [[
-+#ifndef __clang__
-+	not clang
-+#endif
-+	]])],
-+	[CLANG=yes],
-+	[CLANG=no]
-+)
-+AC_MSG_RESULT([$CLANG])
-+AS_IF([test "x$CLANG" = "xyes"], [CLANG_FLAGS=-Wno-error=unused-function])
-+CFLAGS="$CFLAGS $CLANG_FLAGS"
-+LDFLAGS="$LDFLAGS $CLANG_FLAGS"
-+
- AC_MSG_CHECKING(for more warnings)
- if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then
- 	AC_MSG_RESULT(yes)
- 	CFLAGS="-Wall -std=gnu89 $CFLAGS"
-+	if test "x$set_more_warnings" = xerror; then
-+		WERROR="-Werror"
-+	fi
- 
- 	for option in -Wmissing-declarations -Wmissing-prototypes \
- 		      -Wdeclaration-after-statement -Wstrict-prototypes \
-@@ -17,22 +37,23 @@ if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then
- 		      -Wmissing-include-dirs -Waggregate-return \
- 		      -Wformat-security -Wtype-limits; do
- 		SAVE_CFLAGS="$CFLAGS"
--		CFLAGS="$CFLAGS $option"
-+		CFLAGS="$CFLAGS $option $WERROR"
- 		AC_MSG_CHECKING([whether gcc understands $option])
- 		AC_TRY_COMPILE([], [],
- 			has_option=yes,
- 			has_option=no,)
- 		if test $has_option = no; then
- 			CFLAGS="$SAVE_CFLAGS"
-+		else
-+			CFLAGS="$SAVE_CFLAGS $option"
- 		fi
- 		AC_MSG_RESULT($has_option)
- 		unset has_option
- 		unset SAVE_CFLAGS
- 	done
-+	CFLAGS="$CFLAGS $WERROR"
- 	unset option
--	if test "x$set_more_warnings" = xerror; then
--		CFLAGS="$CFLAGS -Werror"
--	fi
-+	unset WERROR
- else
- 	AC_MSG_RESULT(no)
- fi
diff --git a/layers/meta-balena-imx8mm/recipes-connectivity/libmbim/libmbim_1.28.4.bb b/layers/meta-balena-imx8mm/recipes-connectivity/libmbim/libmbim_1.28.4.bb
deleted file mode 100644
index a35d9898..00000000
--- a/layers/meta-balena-imx8mm/recipes-connectivity/libmbim/libmbim_1.28.4.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-SUMMARY = "libmbim is library for talking to WWAN devices by MBIM protocol"
-DESCRIPTION = "libmbim is a glib-based library for talking to WWAN modems and devices which speak the Mobile Interface Broadband Model (MBIM) protocol"
-HOMEPAGE = "http://www.freedesktop.org/wiki/Software/libmbim/"
-LICENSE = "GPL-2.0-or-later & LGPL-2.1-or-later"
-LIC_FILES_CHKSUM = " \
-    file://LICENSES/GPL-2.0-or-later.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-    file://LICENSES/LGPL-2.1-or-later.txt;md5=4fbd65380cdd255951079008b364516c \
-"
-
-DEPENDS = "glib-2.0 glib-2.0-native libgudev"
-
-inherit meson pkgconfig bash-completion gobject-introspection
-
-SRCREV = "7f1c7907c4654ba5c619a635cef5475ca161d027"
-SRC_URI = "git://gitlab.freedesktop.org/mobile-broadband/libmbim.git;protocol=https;branch=mbim-1-28"
-
-S = "${WORKDIR}/git"
-
-EXTRA_OEMESON = " \
-    -Dgtk_doc=false \
-    -Dman=false \
-"
diff --git a/layers/meta-balena-imx8mm/recipes-connectivity/libqmi/libqmi/0001-Detect-clang.patch b/layers/meta-balena-imx8mm/recipes-connectivity/libqmi/libqmi/0001-Detect-clang.patch
deleted file mode 100644
index 7a3429b9..00000000
--- a/layers/meta-balena-imx8mm/recipes-connectivity/libqmi/libqmi/0001-Detect-clang.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From 4cfb728804157e8f3c69e11ba4df449d8f76388f Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Thu, 20 Oct 2016 04:42:26 +0000
-Subject: [PATCH] Detect clang
-
-Check for clang compiler since we need to disable
-unused-function warning for clang, at same time
-pass werror when checking for compiler options if
-werror is enabled so spurious options do not get
-enabled. Only the ones that are supported by given
-compiler are accepted.
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Upstream-Status: Pending
-
----
- m4/compiler-warnings.m4 | 29 +++++++++++++++++++++++++----
- 1 file changed, 25 insertions(+), 4 deletions(-)
-
-diff --git a/m4/compiler-warnings.m4 b/m4/compiler-warnings.m4
-index de4a8b0..e4ba718 100644
---- a/m4/compiler-warnings.m4
-+++ b/m4/compiler-warnings.m4
-@@ -2,10 +2,30 @@ AC_DEFUN([LIBQMI_COMPILER_WARNINGS],
- [AC_ARG_ENABLE(more-warnings,
- 	AS_HELP_STRING([--enable-more-warnings], [Possible values: no/yes/error]),
- 	set_more_warnings="$enableval",set_more_warnings=error)
-+
-+# Clang throws a lot of warnings when it does not understand a flag. Disable
-+# this warning for now so other warnings are visible.
-+AC_MSG_CHECKING([if compiling with clang])
-+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [[
-+#ifndef __clang__
-+	not clang
-+#endif
-+	]])],
-+	[CLANG=yes],
-+	[CLANG=no]
-+)
-+AC_MSG_RESULT([$CLANG])
-+AS_IF([test "x$CLANG" = "xyes"], [CLANG_FLAGS=-Wno-error=unused-function])
-+CFLAGS="$CFLAGS $CLANG_FLAGS"
-+LDFLAGS="$LDFLAGS $CLANG_FLAGS"
-+
- AC_MSG_CHECKING(for more warnings)
- if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then
- 	AC_MSG_RESULT(yes)
- 	CFLAGS="-Wall -std=gnu89 $CFLAGS"
-+	if test "x$set_more_warnings" = xerror; then
-+		WERROR="-Werror"
-+	fi
- 
- 	for option in -Wmissing-declarations -Wmissing-prototypes \
- 		      -Wdeclaration-after-statement -Wstrict-prototypes \
-@@ -17,22 +37,23 @@ if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then
- 		      -Wmissing-include-dirs -Waggregate-return \
- 		      -Wformat-security -Wtype-limits; do
- 		SAVE_CFLAGS="$CFLAGS"
--		CFLAGS="$CFLAGS $option"
-+		CFLAGS="$CFLAGS $option $WERROR"
- 		AC_MSG_CHECKING([whether gcc understands $option])
- 		AC_TRY_COMPILE([], [],
- 			has_option=yes,
- 			has_option=no,)
- 		if test $has_option = no; then
- 			CFLAGS="$SAVE_CFLAGS"
-+		else
-+			CFLAGS="$SAVE_CFLAGS $option"
- 		fi
- 		AC_MSG_RESULT($has_option)
- 		unset has_option
- 		unset SAVE_CFLAGS
- 	done
-+	CFLAGS="$CFLAGS $WERROR"
- 	unset option
--	if test "x$set_more_warnings" = xerror; then
--		CFLAGS="$CFLAGS -Werror"
--	fi
-+	unset WERROR
- else
- 	AC_MSG_RESULT(no)
- fi
--- 
-1.9.1
-
diff --git a/layers/meta-balena-imx8mm/recipes-connectivity/libqmi/libqmi_1.32.4.bb b/layers/meta-balena-imx8mm/recipes-connectivity/libqmi/libqmi_1.32.4.bb
deleted file mode 100644
index 7b7a3b23..00000000
--- a/layers/meta-balena-imx8mm/recipes-connectivity/libqmi/libqmi_1.32.4.bb
+++ /dev/null
@@ -1,28 +0,0 @@
-SUMMARY = "libqmi is a library for talking to WWAN devices by QMI protocol"
-DESCRIPTION = "libqmi is a glib-based library for talking to WWAN modems and \
-               devices which speak the Qualcomm MSM Interface (QMI) protocol"
-HOMEPAGE = "http://www.freedesktop.org/wiki/Software/libqmi"
-LICENSE = "GPL-2.0-or-later & LGPL-2.1-or-later"
-LIC_FILES_CHKSUM = " \
-    file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-    file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \
-"
-
-DEPENDS = "glib-2.0 glib-2.0-native"
-
-inherit meson pkgconfig bash-completion gobject-introspection
-
-SRCREV = "6e248aceb66f53b467b343bca1c467a8211dd30d"
-SRC_URI = "git://gitlab.freedesktop.org/mobile-broadband/libqmi.git;protocol=https;branch=qmi-1-32"
-
-S = "${WORKDIR}/git"
-
-PACKAGECONFIG ??= "udev mbim"
-PACKAGECONFIG[udev] = "-Dudev=true,-Dudev=false,libgudev"
-PACKAGECONFIG[mbim] = "-Dmbim_qmux=true,-Dmbim_qmux=false,libmbim"
-PACKAGECONFIG[qrtr] = "-Dqrtr=true,-Dqrtr=false,libqrtr-glib"
-
-EXTRA_OEMESON = " \
-    -Dgtk_doc=false \
-    -Dman=false \
-"
diff --git a/layers/meta-balena-imx8mm/recipes-connectivity/modemmanager/balena-files/0001-increase-qmi-port-open-timeout.patch b/layers/meta-balena-imx8mm/recipes-connectivity/modemmanager/balena-files/0001-increase-qmi-port-open-timeout.patch
deleted file mode 100644
index 81c76519..00000000
--- a/layers/meta-balena-imx8mm/recipes-connectivity/modemmanager/balena-files/0001-increase-qmi-port-open-timeout.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 0376210a81c19b48499fc613fe3dbe49855e5264 Mon Sep 17 00:00:00 2001
-From: Alexandru Costache <alexandru@balena.io>
-Date: Wed, 12 Jul 2023 11:08:54 +0200
-Subject: [PATCH] increase qmi port open timeout
-
-The SIM7600G modem will fail to connect using
-QMI and the default 45s timeout, nor with a 65s
-one. The value we found to work consistently
-with this modem connected over pcie is 95s.
-
-Upstream-status: Inappropriate [configuration]
-Signed-off-by: Alexandru Costache <alexandru@balena.io>
-
----
- src/mm-port-qmi.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/mm-port-qmi.c b/src/mm-port-qmi.c
-index fa09f32df..31e762527 100644
---- a/src/mm-port-qmi.c
-+++ b/src/mm-port-qmi.c
-@@ -2438,7 +2438,7 @@ port_open_step (GTask *task)
-             mm_obj_dbg (self, "Opening device with flags: %s...", open_flags_str);
-             qmi_device_open (ctx->device,
-                              open_flags,
--                             45,
-+                             95,
-                              g_task_get_cancellable (task),
-                              (GAsyncReadyCallback) qmi_device_open_first_ready,
-                              task);
--- 
-2.37.2
-
diff --git a/layers/meta-balena-imx8mm/recipes-connectivity/modemmanager/balena-files/77-mm-huawei-configuration.rules b/layers/meta-balena-imx8mm/recipes-connectivity/modemmanager/balena-files/77-mm-huawei-configuration.rules
deleted file mode 100644
index f7a5726d..00000000
--- a/layers/meta-balena-imx8mm/recipes-connectivity/modemmanager/balena-files/77-mm-huawei-configuration.rules
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright (c) 2013 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-# This file specifies udev rules to configure certain Huawei modems to select
-# the USB configuration expected by Chrome OS.
-# Huawei ME936: Select the MBIM configuration
-ACTION=="add|change", SUBSYSTEM=="usb", \
-  ENV{DEVTYPE}=="usb_device|usb_interface", \
-  ATTRS{idVendor}=="12d1", ATTRS{idProduct}=="15bb", \
-  ATTRS{bNumConfigurations}=="3", ATTRS{bConfigurationValue}!="3", \
-  RUN+="/lib/udev/mm-huawei-configuration-switch.sh %E{DEVTYPE} %S%p 3"
diff --git a/layers/meta-balena-imx8mm/recipes-connectivity/modemmanager/balena-files/77-mm-u-blox-modeswitch.rules b/layers/meta-balena-imx8mm/recipes-connectivity/modemmanager/balena-files/77-mm-u-blox-modeswitch.rules
deleted file mode 100644
index cdbe0206..00000000
--- a/layers/meta-balena-imx8mm/recipes-connectivity/modemmanager/balena-files/77-mm-u-blox-modeswitch.rules
+++ /dev/null
@@ -1,5 +0,0 @@
-ACTION!="add|change", GOTO="modeswitch_rules_end"
-
-KERNEL=="ttyACM*", ATTRS{idVendor}=="1546", ATTRS{idProduct}=="1146", TAG+="systemd", ENV{SYSTEMD_WANTS}="u-blox-switch@%E{DEVNAME}.service"
-
-LABEL="modeswitch_rules_end"
diff --git a/layers/meta-balena-imx8mm/recipes-connectivity/modemmanager/balena-files/ModemManager.conf.systemd b/layers/meta-balena-imx8mm/recipes-connectivity/modemmanager/balena-files/ModemManager.conf.systemd
deleted file mode 100644
index dc90cb10..00000000
--- a/layers/meta-balena-imx8mm/recipes-connectivity/modemmanager/balena-files/ModemManager.conf.systemd
+++ /dev/null
@@ -1,5 +0,0 @@
-[Service]
-ExecStart=
-ExecStart=/usr/sbin/ModemManager --log-journal
-Restart=always
-RestartSec=10s
diff --git a/layers/meta-balena-imx8mm/recipes-connectivity/modemmanager/balena-files/mm-huawei-configuration-switch.sh b/layers/meta-balena-imx8mm/recipes-connectivity/modemmanager/balena-files/mm-huawei-configuration-switch.sh
deleted file mode 100755
index 44ae3d4a..00000000
--- a/layers/meta-balena-imx8mm/recipes-connectivity/modemmanager/balena-files/mm-huawei-configuration-switch.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# Copyright (c) 2014 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# $1 is either "usb_device" or "usb_interface" depending on what triggered this
-# script.
-# $2 is the full sysfs path to the device/interface.
-# $3 is the configuration mode number we switch the modem to
-
-switch_device_configuration() {
-  # expect:
-  #  $1 : sysfs path for the device.
-  #  $2 : the configuration mode number we switch the modem to
-  echo "$2" > "$1"/bConfigurationValue
-}
-
-if [ "$1" = "usb_device" ]
-then
-  switch_device_configuration "$2" "$3"
-else
-  switch_device_configuration "$(dirname "$2")" "$3"
-fi
diff --git a/layers/meta-balena-imx8mm/recipes-connectivity/modemmanager/balena-files/u-blox-switch.sh b/layers/meta-balena-imx8mm/recipes-connectivity/modemmanager/balena-files/u-blox-switch.sh
deleted file mode 100644
index cdf082b6..00000000
--- a/layers/meta-balena-imx8mm/recipes-connectivity/modemmanager/balena-files/u-blox-switch.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-set -e
-MODEM_TTY_PATH=$1
-
-# wait for the modem to be powered on
-while [ x`mmcli -m 0 --output-keyvalue 2>/dev/null | grep -i power-state | awk -F ": " '{ print $2 }'` != x"on" ] ; do sleep 1; done
-
-echo -e "AT+UUSBCONF=2,\"ECM\"\r\n" > $MODEM_TTY_PATH
-
-echo -e "AT+CFUN=1,1\r\n" > $MODEM_TTY_PATH
diff --git a/layers/meta-balena-imx8mm/recipes-connectivity/modemmanager/balena-files/u-blox-switch@.service b/layers/meta-balena-imx8mm/recipes-connectivity/modemmanager/balena-files/u-blox-switch@.service
deleted file mode 100644
index 660c6ce8..00000000
--- a/layers/meta-balena-imx8mm/recipes-connectivity/modemmanager/balena-files/u-blox-switch@.service
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=Switch u-blox modem from RNDIS to ECM mode
-Wants=ModemManager.service
-After=ModemManager.service
-
-[Service]
-Type=oneshot
-ExecStart=/usr/bin/u-blox-switch.sh %I
diff --git a/layers/meta-balena-imx8mm/recipes-connectivity/modemmanager/modemmanager_%.bbappend b/layers/meta-balena-imx8mm/recipes-connectivity/modemmanager/modemmanager_%.bbappend
deleted file mode 100644
index 79503b75..00000000
--- a/layers/meta-balena-imx8mm/recipes-connectivity/modemmanager/modemmanager_%.bbappend
+++ /dev/null
@@ -1,35 +0,0 @@
-FILESEXTRAPATHS:append := ":${THISDIR}/balena-files"
-SYSTEMD_AUTO_ENABLE = "enable"
-
-SRC_URI:append = " \
-    file://77-mm-huawei-configuration.rules \
-    file://mm-huawei-configuration-switch.sh \
-    file://77-mm-u-blox-modeswitch.rules \
-    file://u-blox-switch@.service \
-    file://u-blox-switch.sh \
-    file://ModemManager.conf.systemd \
-    file://0001-increase-qmi-port-open-timeout.patch \
-"
-
-PACKAGECONFIG:remove = "polkit"
-
-do_install:append() {
-    install -d ${D}${base_libdir}/udev/rules.d/
-    install -m 0644 ${WORKDIR}/77-mm-huawei-configuration.rules ${D}${base_libdir}/udev/rules.d/
-    install -m 0755 ${WORKDIR}/mm-huawei-configuration-switch.sh ${D}${base_libdir}/udev/
-    install -m 0644 ${WORKDIR}/77-mm-u-blox-modeswitch.rules ${D}${base_libdir}/udev/rules.d
-    install -d ${D}${bindir}
-    install -m 0755 ${WORKDIR}/u-blox-switch.sh ${D}${bindir}
-    install -d ${D}${systemd_unitdir}/system/ModemManager.service.d
-    install -m 0644 ${WORKDIR}/ModemManager.conf.systemd ${D}${systemd_unitdir}/system/ModemManager.service.d/ModemManager.conf
-    install -m 0644 ${WORKDIR}/u-blox-switch@.service ${D}${systemd_unitdir}/system
-}
-
-FILES:${PN} += " \
-    ${base_libdir}/udev/rules.d/77-mm-huawei-configuration.rules \
-    ${base_libdir}/udev/mm-huawei-configuration-switch.sh \
-    ${base_libdir}/udev/rules.d/77-mm-u-blox-modeswitch.rules \
-    ${systemd_unitdir}/system/u-blox-switch@.service \
-    ${bindir}/u-blox-switch.sh \
-    ${systemd_unitdir}/system/ModemManager.service.d/ModemManager.conf \
-    "
diff --git a/layers/meta-balena-imx8mm/recipes-connectivity/modemmanager/modemmanager_1.20.6.bb b/layers/meta-balena-imx8mm/recipes-connectivity/modemmanager/modemmanager_1.20.6.bb
deleted file mode 100644
index 7c86fe52..00000000
--- a/layers/meta-balena-imx8mm/recipes-connectivity/modemmanager/modemmanager_1.20.6.bb
+++ /dev/null
@@ -1,53 +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-or-later & LGPL-2.1-or-later"
-LIC_FILES_CHKSUM = " \
-    file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-    file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \
-"
-
-GNOMEBASEBUILDCLASS = "meson"
-inherit gnomebase gettext systemd gobject-introspection bash-completion
-
-DEPENDS = "glib-2.0 libgudev libxslt-native dbus"
-
-SRCREV = "6aa0ff583d04aea88b4da7a1c20049f57062dab6"
-SRC_URI = "git://gitlab.freedesktop.org/mobile-broadband/ModemManager.git;protocol=https;branch=mm-1-20"
-
-S = "${WORKDIR}/git"
-
-# strict, permissive
-MODEMMANAGER_POLKIT_TYPE ??= "permissive"
-
-PACKAGECONFIG ??= "mbim qmi \
-    ${@bb.utils.filter('DISTRO_FEATURES', 'systemd polkit', d)} \
-"
-
-PACKAGECONFIG[at] = "-Dat_command_via_dbus=true"
-PACKAGECONFIG[systemd] = " \
-    -Dsystemdsystemunitdir=${systemd_unitdir}/system/, \
-    -Dsystemdsystemunitdir=no -Dsystemd_journal=false -Dsystemd_suspend_resume=false \
-"
-PACKAGECONFIG[polkit] = "-Dpolkit=${MODEMMANAGER_POLKIT_TYPE},-Dpolkit=no,polkit"
-# Support WWAN modems and devices which speak the Mobile Interface Broadband Model (MBIM) protocol.
-PACKAGECONFIG[mbim] = "-Dmbim=true,-Dmbim=false -Dplugin_dell=disabled -Dplugin_foxconn=disabled,libmbim"
-# Support WWAN modems and devices which speak the Qualcomm MSM Interface (QMI) protocol.
-PACKAGECONFIG[qmi] = "-Dqmi=true,-Dqmi=false,libqmi"
-PACKAGECONFIG[qrtr] = "-Dqrtr=true,-Dqrtr=false,libqrtr-glib"
-
-EXTRA_OEMESON = " \
-    -Dudevdir=${nonarch_base_libdir}/udev \
-    -Dqrtr=false \
-"
-
-FILES:${PN} += " \
-    ${datadir}/icons \
-    ${datadir}/polkit-1 \
-    ${datadir}/dbus-1 \
-    ${datadir}/ModemManager \
-    ${libdir}/ModemManager \
-    ${systemd_unitdir}/system \
-"
-
-SYSTEMD_SERVICE:${PN} = "ModemManager.service"