From e7288e9c880300ef92b81a231b8637b5021debba Mon Sep 17 00:00:00 2001 From: Alexandre Bard Date: Tue, 6 Nov 2018 13:04:12 +0100 Subject: [PATCH] modemmanager: Remove old useless recipe and patches BugzID: 53945 --- .../files/add-me909s-support.patch | 13 --- .../files/disable-dhcp-on-me909u.patch | 82 ------------------- .../modemmanager/files/make-compilable.patch | 13 --- .../modemmanager/modemmanager-debug_1.6.0.bb | 18 ---- .../modemmanager/modemmanager_1.6.0.bb | 44 ---------- 5 files changed, 170 deletions(-) delete mode 100644 recipes-connectivity/modemmanager/files/add-me909s-support.patch delete mode 100644 recipes-connectivity/modemmanager/files/disable-dhcp-on-me909u.patch delete mode 100644 recipes-connectivity/modemmanager/files/make-compilable.patch delete mode 100644 recipes-connectivity/modemmanager/modemmanager-debug_1.6.0.bb delete mode 100644 recipes-connectivity/modemmanager/modemmanager_1.6.0.bb diff --git a/recipes-connectivity/modemmanager/files/add-me909s-support.patch b/recipes-connectivity/modemmanager/files/add-me909s-support.patch deleted file mode 100644 index 64d7923..0000000 --- a/recipes-connectivity/modemmanager/files/add-me909s-support.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/plugins/huawei/77-mm-huawei-net-port-types.rules 2016-08-23 17:49:52.791022448 +0200 -+++ b/plugins/huawei/77-mm-huawei-net-port-types.rules 2016-08-23 17:50:02.675217020 +0200 -@@ -11,6 +11,10 @@ - SUBSYSTEMS=="usb", ATTRS{bInterfaceClass}=="ff", ATTRS{bInterfaceSubClass}=="01", ATTRS{bInterfaceProtocol}=="02", ENV{ID_MM_HUAWEI_AT_PORT}="1" - SUBSYSTEMS=="usb", ATTRS{bInterfaceClass}=="ff", ATTRS{bInterfaceSubClass}=="02", ATTRS{bInterfaceProtocol}=="01", ENV{ID_MM_HUAWEI_MODEM_PORT}="1" - SUBSYSTEMS=="usb", ATTRS{bInterfaceClass}=="ff", ATTRS{bInterfaceSubClass}=="02", ATTRS{bInterfaceProtocol}=="02", ENV{ID_MM_HUAWEI_AT_PORT}="1" -+SUBSYSTEMS=="usb", ATTRS{bInterfaceClass}=="ff", ATTRS{bInterfaceSubClass}=="06", ATTRS{bInterfaceProtocol}=="10", ENV{ID_MM_HUAWEI_MODEM_PORT}="1" -+SUBSYSTEMS=="usb", ATTRS{bInterfaceClass}=="ff", ATTRS{bInterfaceSubClass}=="06", ATTRS{bInterfaceProtocol}=="12", ENV{ID_MM_HUAWEI_AT_PORT}="1" -+SUBSYSTEMS=="usb", ATTRS{bInterfaceClass}=="ff", ATTRS{bInterfaceSubClass}=="01", ATTRS{bInterfaceProtocol}=="10", ENV{ID_MM_HUAWEI_MODEM_PORT}="1" -+SUBSYSTEMS=="usb", ATTRS{bInterfaceClass}=="ff", ATTRS{bInterfaceSubClass}=="01", ATTRS{bInterfaceProtocol}=="13", ENV{ID_MM_HUAWEI_AT_PORT}="1" - - # GPS NMEA port on MU609 - SUBSYSTEMS=="usb", ATTRS{bInterfaceClass}=="ff", ATTRS{bInterfaceSubClass}=="01", ATTRS{bInterfaceProtocol}=="05", ENV{ID_MM_HUAWEI_GPS_PORT}="1" diff --git a/recipes-connectivity/modemmanager/files/disable-dhcp-on-me909u.patch b/recipes-connectivity/modemmanager/files/disable-dhcp-on-me909u.patch deleted file mode 100644 index 680aaf4..0000000 --- a/recipes-connectivity/modemmanager/files/disable-dhcp-on-me909u.patch +++ /dev/null @@ -1,82 +0,0 @@ -diff --git a/plugins/huawei/77-mm-huawei-net-port-types.rules b/plugins/huawei/77-mm-huawei-net-port-types.rules -index f60f1f8..d35f2d5 100644 ---- a/plugins/huawei/77-mm-huawei-net-port-types.rules -+++ b/plugins/huawei/77-mm-huawei-net-port-types.rules -@@ -6,6 +6,9 @@ ENV{ID_VENDOR_ID}!="12d1", GOTO="mm_huawei_port_types_end" - # MU609 does not support getportmode (crashes modem with default firmware) - ATTRS{idProduct}=="1573", ENV{ID_MM_HUAWEI_DISABLE_GETPORTMODE}="1" - -+# MU909u does not support DHCP properly, it can happen that the Ethernet frames do not attach the Ethernet header afterwards. -+ATTRS{idProduct}=="1573", ENV{ID_MM_HUAWEI_DISABLE_DHCP}="1" -+ - # Mark the modem and at port flags for ModemManager - SUBSYSTEMS=="usb", ATTRS{bInterfaceClass}=="ff", ATTRS{bInterfaceSubClass}=="01", ATTRS{bInterfaceProtocol}=="01", ENV{ID_MM_HUAWEI_MODEM_PORT}="1" - SUBSYSTEMS=="usb", ATTRS{bInterfaceClass}=="ff", ATTRS{bInterfaceSubClass}=="01", ATTRS{bInterfaceProtocol}=="02", ENV{ID_MM_HUAWEI_AT_PORT}="1" -diff --git a/plugins/huawei/mm-broadband-bearer-huawei.c b/plugins/huawei/mm-broadband-bearer-huawei.c -index 60a91e5..11782c3 100644 ---- a/plugins/huawei/mm-broadband-bearer-huawei.c -+++ b/plugins/huawei/mm-broadband-bearer-huawei.c -@@ -465,17 +465,34 @@ connect_3gpp_context_step (Connect3gppContext *ctx) - g_object_ref (ctx->self)); - return; - -- case CONNECT_3GPP_CONTEXT_STEP_IP_CONFIG: -- mm_base_modem_at_command_full (ctx->modem, -- ctx->primary, -- "^DHCP?", -- 3, -- FALSE, -- FALSE, -- NULL, -- (GAsyncReadyCallback)connect_dhcp_check_ready, -- g_object_ref (ctx->self)); -- return; -+ case CONNECT_3GPP_CONTEXT_STEP_IP_CONFIG: { -+ GUdevClient *client; -+ GUdevDevice *data_device; -+ -+ // ME909u has a problem with DHCP over AT. If it's done right after NDSIDUP -+ // the modem doesn't send the Ethernet header anymore which confuses the network stack -+ client = g_udev_client_new (NULL); -+ data_device = (g_udev_client_query_by_subsystem_and_name ( -+ client, -+ "tty", -+ mm_port_get_device (&ctx->primary->parent.parent))); -+ if (!data_device || !g_udev_device_get_property_as_boolean (data_device, "ID_MM_HUAWEI_DISABLE_DHCP")) { -+ mm_base_modem_at_command_full (ctx->modem, -+ ctx->primary, -+ "^DHCP?", -+ 3, -+ FALSE, -+ FALSE, -+ NULL, -+ (GAsyncReadyCallback)connect_dhcp_check_ready, -+ g_object_ref (ctx->self)); -+ return; -+ } -+ -+ mm_info("This device (%s) does not support DHCP over AT", mm_port_get_device (ctx->data)); -+ ctx->step ++; -+ /* Fall down to the next step */ -+ } - - case CONNECT_3GPP_CONTEXT_STEP_LAST: - /* Clear context */ -@@ -489,6 +506,17 @@ connect_3gpp_context_step (Connect3gppContext *ctx) - mm_bearer_connect_result_new (ctx->data, ctx->ipv4_config, NULL), - (GDestroyNotify)mm_bearer_connect_result_unref); - } -+ else { -+ MMBearerIpConfig *ipv4_config; -+ -+ ipv4_config = mm_bearer_ip_config_new (); -+ mm_bearer_ip_config_set_method (ipv4_config, MM_BEARER_IP_METHOD_DHCP); -+ g_simple_async_result_set_op_res_gpointer ( -+ ctx->result, -+ mm_bearer_connect_result_new (ctx->data, ipv4_config, NULL), -+ (GDestroyNotify)mm_bearer_connect_result_unref); -+ g_object_unref (ipv4_config); -+ } - } - - connect_3gpp_context_complete_and_free (ctx); diff --git a/recipes-connectivity/modemmanager/files/make-compilable.patch b/recipes-connectivity/modemmanager/files/make-compilable.patch deleted file mode 100644 index 4f59d91..0000000 --- a/recipes-connectivity/modemmanager/files/make-compilable.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index ce1e2ea..6615c08 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -26,7 +26,7 @@ dnl----------------------------------------------------------------------------- - dnl autoconf, automake, libtool initialization - dnl - AC_INIT([ModemManager],[mm_version],[modemmanager-devel@lists.freedesktop.org],[ModemManager]) --AM_INIT_AUTOMAKE([1.11.2 subdir-objects tar-ustar no-dist-gzip dist-xz -Wno-portability]) -+AM_INIT_AUTOMAKE([1.11.2 subdir-objects tar-ustar no-dist-gzip dist-xz -Wno-portability foreign]) - m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) - - AM_MAINTAINER_MODE([enable]) diff --git a/recipes-connectivity/modemmanager/modemmanager-debug_1.6.0.bb b/recipes-connectivity/modemmanager/modemmanager-debug_1.6.0.bb deleted file mode 100644 index f0e2d76..0000000 --- a/recipes-connectivity/modemmanager/modemmanager-debug_1.6.0.bb +++ /dev/null @@ -1,18 +0,0 @@ -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-nrhw16() { - 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 -} - -do_install_append_am335x-nmhw21() { - 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 deleted file mode 100644 index af75616..0000000 --- a/recipes-connectivity/modemmanager/modemmanager_1.6.0.bb +++ /dev/null @@ -1,44 +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 = "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 libgudev dbus-glib intltool-native" - -SRC_URI = " \ - http://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz \ - file://add-me909s-support.patch \ - file://disable-dhcp-on-me909u.patch \ - " - -SRC_URI[md5sum] = "d9d93d2961ee35b4cd8a75a6a8631cb4" -SRC_URI[sha256sum] = "a94f4657a8fa6835e2734fcc6edf20aa8c8d452f62299d7748541021c3eb2445" - -S = "${WORKDIR}/ModemManager-${PV}" - -FILES_${PN} += " \ - ${datadir}/icons \ - ${datadir}/polkit-1 \ - ${datadir}/bash-completion \ - ${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"