summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Agner <stefan.agner@toradex.com>2019-11-19 17:24:34 +0000
committerKhem Raj <raj.khem@gmail.com>2019-11-20 06:57:07 -0800
commit82ecc0e69fe3920360d1ba8bd1b5e6ede164de42 (patch)
treefb83925c93e82c5af9a1991cd6341d63ff2a265e
parent0e160f4297ef7e88bec0a03e52934c2c4681cd98 (diff)
downloadmeta-openembedded-82ecc0e69fe3920360d1ba8bd1b5e6ede164de42.tar.gz
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@toradex.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-networking/recipes-connectivity/networkmanager/networkmanager_1.18.4.bb5
1 files changed, 4 insertions, 1 deletions
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 085807c4ce..27508c4d93 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() {
141 141
142 rm -rf ${D}/run ${D}${localstatedir}/run 142 rm -rf ${D}/run ${D}${localstatedir}/run
143 143
144 # For read-only filesystem, do not create links during bootup
145 if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then 144 if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
145 # For read-only filesystem, do not create links during bootup
146 ln -sf ../run/NetworkManager/resolv.conf ${D}${sysconfdir}/resolv-conf.NetworkManager 146 ln -sf ../run/NetworkManager/resolv.conf ${D}${sysconfdir}/resolv-conf.NetworkManager
147
148 # systemd v210 and newer do not need this rule file
149 rm ${D}/${nonarch_base_libdir}/udev/rules.d/84-nm-drivers.rules
147 fi 150 fi
148} 151}