[oe-commits] [meta-openembedded] 17/23: networkmanager: do not deploy unnecessary udev rule file

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

khem pushed a commit to branch master-next
in repository meta-openembedded.

commit fe4e9ee032ec76b6bba1eb8403b10f98c57bfb64
Author: Stefan Agner <stefan.agner at toradex.com>
AuthorDate: Tue Nov 19 17:24:34 2019 +0000

    networkmanager: do not deploy unnecessary udev rule file
    
    The 84-nm-drivers.rules is not required for systemd-udevd versions
    v210 and later. The file has been split into a separate file so
    distributions with a new enough systemd version can drop it. See
    also:
    https://github.com/NetworkManager/NetworkManager/commit/1e0375826252abf9aab2aef273a2a24cd08c9f42
    
    I noticed this while investigating into a warning show during
    bootup:
      /usr/lib/udev/rules.d/84-nm-drivers.rules:10 Invalid value "/bin/sh -c
      'ethtool -i $1 | sed -n s/^driver:\ //p' -- $env{INTERFACE}" for PROGRAM
      (char 24: invalid substitution type), ignoring, but please fix it.
    
    Signed-off-by: Stefan Agner <stefan.agner at toradex.com>
    Signed-off-by: Khem Raj <raj.khem at gmail.com>
---
 .../recipes-connectivity/networkmanager/networkmanager_1.18.4.bb     | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.18.4.bb b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.18.4.bb
index 085807c..27508c4 100644
--- a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.18.4.bb
+++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.18.4.bb
@@ -141,8 +141,11 @@ do_install_append() {
 
     rm -rf ${D}/run ${D}${localstatedir}/run
 
-    # For read-only filesystem, do not create links during bootup
     if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
+        # For read-only filesystem, do not create links during bootup
         ln -sf ../run/NetworkManager/resolv.conf ${D}${sysconfdir}/resolv-conf.NetworkManager
+
+        # systemd v210 and newer do not need this rule file
+        rm ${D}/${nonarch_base_libdir}/udev/rules.d/84-nm-drivers.rules
     fi
 }

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.