From 400110aaf9d15af3525506c51443224164230b5d Mon Sep 17 00:00:00 2001 From: Arturo Buzarra Date: Fri, 10 Jan 2020 08:48:11 +0100 Subject: [PATCH] modemmanager: remove support to serial XBee cellular devices Serial support to XBee cellular devices is deprecated since the recommended communication protocol is USB, so we remove the udev rules that supported these devices. Signed-off-by: Arturo Buzarra --- .../ccimx6/78-mm-digi-xbee-cellular.rules | 11 ----------- .../ccimx6ul/78-mm-digi-xbee-cellular.rules | 11 ----------- .../ccimx8mn/78-mm-digi-xbee-cellular.rules | 10 ---------- .../78-mm-digi-xbee-cellular.rules | 10 ---------- .../ccimx8x-sbc-pro/78-mm-digi-xbee-cellular.rules | 10 ---------- .../modemmanager/modemmanager_%.bbappend | 6 +----- 6 files changed, 1 insertion(+), 57 deletions(-) delete mode 100644 meta-digi-dey/recipes-connectivity/modemmanager/modemmanager/ccimx6/78-mm-digi-xbee-cellular.rules delete mode 100644 meta-digi-dey/recipes-connectivity/modemmanager/modemmanager/ccimx6ul/78-mm-digi-xbee-cellular.rules delete mode 100644 meta-digi-dey/recipes-connectivity/modemmanager/modemmanager/ccimx8mn/78-mm-digi-xbee-cellular.rules delete mode 100644 meta-digi-dey/recipes-connectivity/modemmanager/modemmanager/ccimx8x-sbc-express/78-mm-digi-xbee-cellular.rules delete mode 100644 meta-digi-dey/recipes-connectivity/modemmanager/modemmanager/ccimx8x-sbc-pro/78-mm-digi-xbee-cellular.rules diff --git a/meta-digi-dey/recipes-connectivity/modemmanager/modemmanager/ccimx6/78-mm-digi-xbee-cellular.rules b/meta-digi-dey/recipes-connectivity/modemmanager/modemmanager/ccimx6/78-mm-digi-xbee-cellular.rules deleted file mode 100644 index 9f999dd1c..000000000 --- a/meta-digi-dey/recipes-connectivity/modemmanager/modemmanager/ccimx6/78-mm-digi-xbee-cellular.rules +++ /dev/null @@ -1,11 +0,0 @@ -ACTION!="add|change|move", GOTO="mm_digi_xbee_cellular_modem_end" - -# By default, ModemManager expects a default baudrate of 57600bps. Different -# baudrates may be used by setting the ID_MM_TTY_BAUDRATE udev tag. - -# ModemManager documentation states that the best practice is to use the DEVPATH -# this way rather than other rules such as KERNEL, so be careful when modifying -DEVPATH=="/devices/soc0/soc.0/2100000.aips-bus/21f4000.serial/tty/ttymxc4", ENV{ID_MM_PLATFORM_DRIVER_PROBE}="1", ENV{ID_MM_PHYSDEV_UID}="Digi XBee Cellular" -DEVPATH=="/devices/soc0/soc/2100000.aips-bus/21f4000.serial/tty/ttymxc4", ENV{ID_MM_PLATFORM_DRIVER_PROBE}="1", ENV{ID_MM_PHYSDEV_UID}="Digi XBee Cellular" - -LABEL="mm_digi_xbee_cellular_modem_end" diff --git a/meta-digi-dey/recipes-connectivity/modemmanager/modemmanager/ccimx6ul/78-mm-digi-xbee-cellular.rules b/meta-digi-dey/recipes-connectivity/modemmanager/modemmanager/ccimx6ul/78-mm-digi-xbee-cellular.rules deleted file mode 100644 index 31fbcc68e..000000000 --- a/meta-digi-dey/recipes-connectivity/modemmanager/modemmanager/ccimx6ul/78-mm-digi-xbee-cellular.rules +++ /dev/null @@ -1,11 +0,0 @@ -ACTION!="add|change|move", GOTO="mm_digi_xbee_cellular_modem_end" - -# By default, ModemManager expects a default baudrate of 57600bps. Different -# baudrates may be used by setting the ID_MM_TTY_BAUDRATE udev tag. - -# ModemManager documentation states that the best practice is to use the DEVPATH -# this way rather than other rules such as KERNEL, so be careful when modifying -DEVPATH=="/devices/platform/soc/2100000.aips-bus/21e8000.serial/tty/ttymxc1", ENV{ID_MM_PLATFORM_DRIVER_PROBE}="1", ENV{ID_MM_PHYSDEV_UID}="Digi XBee Cellular" -DEVPATH=="/devices/soc0/soc/2100000.aips-bus/21e8000.serial/tty/ttymxc1", ENV{ID_MM_PLATFORM_DRIVER_PROBE}="1", ENV{ID_MM_PHYSDEV_UID}="Digi XBee Cellular" - -LABEL="mm_digi_xbee_cellular_modem_end" diff --git a/meta-digi-dey/recipes-connectivity/modemmanager/modemmanager/ccimx8mn/78-mm-digi-xbee-cellular.rules b/meta-digi-dey/recipes-connectivity/modemmanager/modemmanager/ccimx8mn/78-mm-digi-xbee-cellular.rules deleted file mode 100644 index f4b484c18..000000000 --- a/meta-digi-dey/recipes-connectivity/modemmanager/modemmanager/ccimx8mn/78-mm-digi-xbee-cellular.rules +++ /dev/null @@ -1,10 +0,0 @@ -ACTION!="add|change|move", GOTO="mm_digi_xbee_cellular_modem_end" - -# By default, ModemManager expects a default baudrate of 57600bps. Different -# baudrates may be used by setting the ID_MM_TTY_BAUDRATE udev tag. - -# ModemManager documentation states that the best practice is to use the DEVPATH -# this way rather than other rules such as KERNEL, so be careful when modifying -DEVPATH=="/devices/platform/30a60000.serial/tty/ttymxc3", ENV{ID_MM_PLATFORM_DRIVER_PROBE}="1", ENV{ID_MM_PHYSDEV_UID}="Digi XBee Cellular" - -LABEL="mm_digi_xbee_cellular_modem_end" diff --git a/meta-digi-dey/recipes-connectivity/modemmanager/modemmanager/ccimx8x-sbc-express/78-mm-digi-xbee-cellular.rules b/meta-digi-dey/recipes-connectivity/modemmanager/modemmanager/ccimx8x-sbc-express/78-mm-digi-xbee-cellular.rules deleted file mode 100644 index 9ab0f5998..000000000 --- a/meta-digi-dey/recipes-connectivity/modemmanager/modemmanager/ccimx8x-sbc-express/78-mm-digi-xbee-cellular.rules +++ /dev/null @@ -1,10 +0,0 @@ -ACTION!="add|change|move", GOTO="mm_digi_xbee_cellular_modem_end" - -# By default, ModemManager expects a default baudrate of 57600bps. Different -# baudrates may be used by setting the ID_MM_TTY_BAUDRATE udev tag. - -# ModemManager documentation states that the best practice is to use the DEVPATH -# this way rather than other rules such as KERNEL, so be careful when modifying -DEVPATH=="/devices/platform/5a060000.serial/tty/ttyLP0", ENV{ID_MM_PLATFORM_DRIVER_PROBE}="1", ENV{ID_MM_PHYSDEV_UID}="Digi XBee Cellular" - -LABEL="mm_digi_xbee_cellular_modem_end" diff --git a/meta-digi-dey/recipes-connectivity/modemmanager/modemmanager/ccimx8x-sbc-pro/78-mm-digi-xbee-cellular.rules b/meta-digi-dey/recipes-connectivity/modemmanager/modemmanager/ccimx8x-sbc-pro/78-mm-digi-xbee-cellular.rules deleted file mode 100644 index b7fa7fab3..000000000 --- a/meta-digi-dey/recipes-connectivity/modemmanager/modemmanager/ccimx8x-sbc-pro/78-mm-digi-xbee-cellular.rules +++ /dev/null @@ -1,10 +0,0 @@ -ACTION!="add|change|move", GOTO="mm_digi_xbee_cellular_modem_end" - -# By default, ModemManager expects a default baudrate of 57600bps. Different -# baudrates may be used by setting the ID_MM_TTY_BAUDRATE udev tag. - -# ModemManager documentation states that the best practice is to use the DEVPATH -# this way rather than other rules such as KERNEL, so be careful when modifying -DEVPATH=="/devices/platform/5a800000.i2c/i2c-0/0-0063/mca-cc8x-uart/tty/ttyMCA0", ENV{ID_MM_PLATFORM_DRIVER_PROBE}="1", ENV{ID_MM_PHYSDEV_UID}="Digi XBee Cellular" - -LABEL="mm_digi_xbee_cellular_modem_end" diff --git a/meta-digi-dey/recipes-connectivity/modemmanager/modemmanager_%.bbappend b/meta-digi-dey/recipes-connectivity/modemmanager/modemmanager_%.bbappend index 8469412aa..5d4bdc0e8 100644 --- a/meta-digi-dey/recipes-connectivity/modemmanager/modemmanager_%.bbappend +++ b/meta-digi-dey/recipes-connectivity/modemmanager/modemmanager_%.bbappend @@ -3,7 +3,6 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" SRC_URI += " \ - file://78-mm-digi-xbee-cellular.rules \ file://80-mm-net-device-blacklist.rules \ file://late-modems-scan.service \ file://late-modems-scan.timer \ @@ -15,11 +14,8 @@ SRC_URI += " \ PACKAGECONFIG_remove = " polkit" do_install_append() { - # Install udev rules for XBee cellular - install -d ${D}${nonarch_base_libdir}/udev/rules.d - install -m 0644 ${WORKDIR}/78-mm-digi-xbee-cellular.rules ${D}${nonarch_base_libdir}/udev/rules.d/ - # Install udev rules for ModemManager blacklist devices + install -d ${D}${nonarch_base_libdir}/udev/rules.d install -m 0644 ${WORKDIR}/80-mm-net-device-blacklist.rules ${D}${nonarch_base_libdir}/udev/rules.d/ # Install systemd service for scanning late modems