modemmanager: update to 1.4.2

modemmanager has moved to freedesktop.org

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>

2 files changed, 40 insertions, 29 deletions

diff --git a/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.4.2.bb b/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.4.2.bb
new file mode 100644
index 0000000000..6dfd0e256f
--- /dev/null
+++ b/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.4.2.bb
@@ -0,0 +1,40 @@
+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 = "GPLv2 & LGPLv2.1"
+LIC_FILES_CHKSUM = " \
+    file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+    file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \
+"
+
+inherit autotools gettext gtk-doc systemd
+
+DEPENDS = "glib-2.0 libmbim libqmi polkit udev dbus-glib"
+
+SRC_URI = "http://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz"
+SRC_URI[md5sum] = "fe74eaa9a77e51e552b4356b4c7195cb"
+SRC_URI[sha256sum] = "07d332fbe6f45f788f740810951e04042aaf023bd5ecf8ef0b3a06e37703585d"
+
+S = "${WORKDIR}/ModemManager-${PV}"
+
+FILES_${PN} += " \
+    ${datadir}/icons \
+    ${datadir}/polkit-1 \
+    ${libdir}/ModemManager \
+    ${systemd_unitdir}/system \
+"
+
+FILES_${PN}-dev += " \
+    ${datadir}/dbus-1 \
+    ${libdir}/ModemManager/*.la \
+"
+
+FILES_${PN}-staticdev += " \
+    ${libdir}/ModemManager/*.a \
+"
+
+FILES_${PN}-dbg += "${libdir}/ModemManager/.debug"
+
+SYSTEMD_SERVICE_${PN} = "ModemManager.service"
+# no need to start on boot - dbus will start on demand
+SYSTEMD_AUTO_ENABLE = "disable"
diff --git a/meta-oe/recipes-connectivity/networkmanager/modemmanager_0.6.0.0.bb b/meta-oe/recipes-connectivity/networkmanager/modemmanager_0.6.0.0.bb
deleted file mode 100644
index 5ff18da057..0000000000
--- a/meta-oe/recipes-connectivity/networkmanager/modemmanager_0.6.0.0.bb
+++ /dev/null
@@ -1,29 +0,0 @@
-DEPENDS = "ppp udev glib-2.0 dbus-glib"
-
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
-
-
-inherit gnomebase gettext
-
-SRC_URI = "${GNOME_MIRROR}/ModemManager/${@gnome_verdir("${PV}")}/ModemManager-${PV}.tar.xz"
-
-SRC_URI[md5sum] = "f32640f6672d997ec0887307186e9639"
-SRC_URI[sha256sum] = "d4468300cf4aa7baf21c8564fa515e578056f34de5a64f452b053331f89e8ae2"
-
-S = "${WORKDIR}/ModemManager-${PV}"
-
-FILES_${PN}-dbg += "${libdir}/ModemManager/.debug \
-                    ${libdir}/pppd/*/.debug"
-FILES_${PN}-dev += "${datadir}/dbus-1/interfaces \
-                    ${libdir}/pppd/*/*.la \
-                    ${libdir}/ModemManager/*.la"
-FILES_${PN}-staticdev += "\
-                          ${libdir}/ModemManager/*.a \
-                          ${libdir}/pppd/*/*.a"
-FILES_${PN} += "${datadir}/dbus-1/*services/ \
-                ${libdir}/ModemManager/*.so \
-                ${libdir}/pppd/*/*.so \
-                ${base_libdir}/udev"
-
-RRECOMMENDS_${PN} += "ppp"