From 979e34de517497d582cc421b6890d1ec8ea663c8 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 6 Nov 2023 21:37:58 -0800 Subject: Revert "modemmanager: upgrade 1.22.0 -> 1.23.1" This reverts commit 5645d60086a2d710dfb582ff9b54564bd3e36354. --- .../modemmanager/modemmanager_1.22.0.bb | 56 ++++++++++++++++++++++ .../modemmanager/modemmanager_1.23.1.bb | 56 ---------------------- 2 files changed, 56 insertions(+), 56 deletions(-) create mode 100644 meta-oe/recipes-connectivity/modemmanager/modemmanager_1.22.0.bb delete mode 100644 meta-oe/recipes-connectivity/modemmanager/modemmanager_1.23.1.bb (limited to 'meta-oe') diff --git a/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.22.0.bb b/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.22.0.bb new file mode 100644 index 0000000000..95884f44c3 --- /dev/null +++ b/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.22.0.bb @@ -0,0 +1,56 @@ +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 = "03f786ce66360d67c669f4f122f8aa458e6f01ea" +SRC_URI = "git://gitlab.freedesktop.org/mobile-broadband/ModemManager.git;protocol=https;branch=mm-1-22" + +S = "${WORKDIR}/git" + +# strict, permissive +MODEMMANAGER_POLKIT_TYPE ??= "permissive" + +PACKAGECONFIG ??= "vala 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" +PACKAGECONFIG[vala] = "-Dvapi=true,-Dvapi=false" + +inherit ${@bb.utils.contains('PACKAGECONFIG', 'vala', 'vala', '', d)} + +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" diff --git a/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.23.1.bb b/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.23.1.bb deleted file mode 100644 index 794e60a473..0000000000 --- a/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.23.1.bb +++ /dev/null @@ -1,56 +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 = "29f8154ef762c173a14199c85ce0bbd4ce188abe" -SRC_URI = "git://gitlab.freedesktop.org/mobile-broadband/ModemManager.git;protocol=https;branch=main" - -S = "${WORKDIR}/git" - -# strict, permissive -MODEMMANAGER_POLKIT_TYPE ??= "permissive" - -PACKAGECONFIG ??= "vala 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" -PACKAGECONFIG[vala] = "-Dvapi=true,-Dvapi=false" - -inherit ${@bb.utils.contains('PACKAGECONFIG', 'vala', 'vala', '', d)} - -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" -- cgit v1.2.3-54-g00ecf