From 512bc14d6a24f6266b187ccb3410175c78d7c752 Mon Sep 17 00:00:00 2001 From: Ramon Moesching Date: Wed, 13 Jun 2018 13:54:08 +0200 Subject: [PATCH] modemmanager: remove fct machine option and create modemmanager-debug packages - renaming patch dir because of debug-package --- .../add-me909s-support.patch | 0 .../disable-dhcp-on-me909u.patch | 0 .../make-compilable.patch | 0 .../modemmanager/modemmanager-debug_1.6.0.bb | 14 ++++++++++++++ .../modemmanager/modemmanager-debug_1.8.0.bb | 16 ++++++++++++++++ .../modemmanager/modemmanager_1.6.0.bb | 10 +--------- .../modemmanager/modemmanager_1.8.0.bb | 9 --------- 7 files changed, 31 insertions(+), 18 deletions(-) rename recipes-connectivity/modemmanager/{modemmanager => files}/add-me909s-support.patch (100%) rename recipes-connectivity/modemmanager/{modemmanager => files}/disable-dhcp-on-me909u.patch (100%) rename recipes-connectivity/modemmanager/{modemmanager => files}/make-compilable.patch (100%) create mode 100644 recipes-connectivity/modemmanager/modemmanager-debug_1.6.0.bb create mode 100644 recipes-connectivity/modemmanager/modemmanager-debug_1.8.0.bb diff --git a/recipes-connectivity/modemmanager/modemmanager/add-me909s-support.patch b/recipes-connectivity/modemmanager/files/add-me909s-support.patch similarity index 100% rename from recipes-connectivity/modemmanager/modemmanager/add-me909s-support.patch rename to recipes-connectivity/modemmanager/files/add-me909s-support.patch diff --git a/recipes-connectivity/modemmanager/modemmanager/disable-dhcp-on-me909u.patch b/recipes-connectivity/modemmanager/files/disable-dhcp-on-me909u.patch similarity index 100% rename from recipes-connectivity/modemmanager/modemmanager/disable-dhcp-on-me909u.patch rename to recipes-connectivity/modemmanager/files/disable-dhcp-on-me909u.patch diff --git a/recipes-connectivity/modemmanager/modemmanager/make-compilable.patch b/recipes-connectivity/modemmanager/files/make-compilable.patch similarity index 100% rename from recipes-connectivity/modemmanager/modemmanager/make-compilable.patch rename to recipes-connectivity/modemmanager/files/make-compilable.patch diff --git a/recipes-connectivity/modemmanager/modemmanager-debug_1.6.0.bb b/recipes-connectivity/modemmanager/modemmanager-debug_1.6.0.bb new file mode 100644 index 0000000..225ea11 --- /dev/null +++ b/recipes-connectivity/modemmanager/modemmanager-debug_1.6.0.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "ModemManager is a DBus-activated daemon which controls mobile broadband (2G/3G/4G) devices and connections\ + Debug version enables access to hardware by cli to get e.g. status messages" + +require modemmanager_1.6.0.bb + +RPROVIDES_modemmanager-debug += " modemmanager" + +do_install_append_am335x-nbhw16() { + sed -i 's/ExecStart=.*/ExecStart=\/usr\/sbin\/ModemManager --debug/g' ${D}/lib/systemd/system/ModemManager.service +} + +do_install_append_am335x-nrhw20() { + sed -i 's/ExecStart=.*/ExecStart=\/usr\/sbin\/ModemManager --debug/g' ${D}/lib/systemd/system/ModemManager.service +} diff --git a/recipes-connectivity/modemmanager/modemmanager-debug_1.8.0.bb b/recipes-connectivity/modemmanager/modemmanager-debug_1.8.0.bb new file mode 100644 index 0000000..2c4c5f0 --- /dev/null +++ b/recipes-connectivity/modemmanager/modemmanager-debug_1.8.0.bb @@ -0,0 +1,16 @@ +DESCRIPTION0 = "ModemManager is a DBus-activated daemon which controls mobile broadband (2G/3G/4G) devices and connections\ + Debug version enables access to hardware by cli to get e.g. status messages" + +require modemmanager_1.8.0.bb + +RPROVIDES_modemmanager-debug += " modemmanager" + +do_install_append_am335x-nbhw16() { + sed -i 's/ExecStart=.*/ExecStart=\/usr\/sbin\/ModemManager --debug/g' ${D}/lib/systemd/system/ModemManager.service +} + +do_install_append_am335x-nrhw20() { + sed -i 's/ExecStart=.*/ExecStart=\/usr\/sbin\/ModemManager --debug/g' ${D}/lib/systemd/system/ModemManager.service +} + + diff --git a/recipes-connectivity/modemmanager/modemmanager_1.6.0.bb b/recipes-connectivity/modemmanager/modemmanager_1.6.0.bb index eb7c4c8..af75616 100644 --- a/recipes-connectivity/modemmanager/modemmanager_1.6.0.bb +++ b/recipes-connectivity/modemmanager/modemmanager_1.6.0.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = " \ inherit autotools gettext gtk-doc systemd -DEPENDS = "glib-2.0 libmbim libqmi polkit libgudev dbus-glib" +DEPENDS = "glib-2.0 libmbim libqmi polkit libgudev dbus-glib intltool-native" SRC_URI = " \ http://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz \ @@ -42,11 +42,3 @@ FILES_${PN}-staticdev += " \ FILES_${PN}-dbg += "${libdir}/ModemManager/.debug" SYSTEMD_SERVICE_${PN} = "ModemManager.service" - -do_install_append_am335x-nbhw16-fct() { - sed -i 's/ExecStart=.*/ExecStart=\/usr\/sbin\/ModemManager --debug/g' ${D}/lib/systemd/system/ModemManager.service -} - -do_install_append_am335x-nrhw20-fct() { - sed -i 's/ExecStart=.*/ExecStart=\/usr\/sbin\/ModemManager --debug/g' ${D}/lib/systemd/system/ModemManager.service -} diff --git a/recipes-connectivity/modemmanager/modemmanager_1.8.0.bb b/recipes-connectivity/modemmanager/modemmanager_1.8.0.bb index f43077e..0d8110e 100644 --- a/recipes-connectivity/modemmanager/modemmanager_1.8.0.bb +++ b/recipes-connectivity/modemmanager/modemmanager_1.8.0.bb @@ -40,12 +40,3 @@ FILES_${PN}-staticdev += " \ FILES_${PN}-dbg += "${libdir}/ModemManager/.debug" SYSTEMD_SERVICE_${PN} = "ModemManager.service" - -do_install_append_am335x-nbhw16-fct() { - sed -i 's/ExecStart=.*/ExecStart=\/usr\/sbin\/ModemManager --debug/g' ${D}/lib/systemd/system/ModemManager.service -} - -do_install_append_am335x-nrhw20-fct() { - sed -i 's/ExecStart=.*/ExecStart=\/usr\/sbin\/ModemManager --debug/g' ${D}/lib/systemd/system/ModemManager.service -} -