From 43e318de2ff3135054233864d2cb95b2d50ca6ea Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Fri, 9 Dec 2022 01:54:23 -0800 Subject: networkmanager: install config files into correct place The current location has no effect, because NetworkManager is not looking for config files there. In meson.build, we have: nm_pkglibdir = join_paths(nm_prefix, 'lib', nm_name) config_extra_h.set_quoted('NMLIBDIR', nm_pkglibdir) It's clear that the configuration directory should be nonarch_libdir instead of libdir. Signed-off-by: Chen Qi Signed-off-by: Khem Raj (cherry picked from commit 15893f46f8af8c91d922fa41f9a1f537d92aeb9a) Signed-off-by: Armin Kuster --- .../recipes-connectivity/networkmanager/networkmanager_1.40.0.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.40.0.bb b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.40.0.bb index 110b499aaa..b9273ac89e 100644 --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.40.0.bb +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.40.0.bb @@ -295,11 +295,11 @@ do_install:append() { # Enable iwd if compiled if ${@bb.utils.contains('PACKAGECONFIG','iwd','true','false',d)}; then - install -Dm 0644 ${WORKDIR}/enable-iwd.conf ${D}${libdir}/NetworkManager/conf.d/enable-iwd.conf + install -Dm 0644 ${WORKDIR}/enable-iwd.conf ${D}${nonarch_libdir}/NetworkManager/conf.d/enable-iwd.conf fi # Enable dhcpd if compiled if ${@bb.utils.contains('PACKAGECONFIG','dhcpcd','true','false',d)}; then - install -Dm 0644 ${WORKDIR}/enable-dhcpcd.conf ${D}${libdir}/NetworkManager/conf.d/enable-dhcpcd.conf + install -Dm 0644 ${WORKDIR}/enable-dhcpcd.conf ${D}${nonarch_libdir}/NetworkManager/conf.d/enable-dhcpcd.conf fi } -- cgit v1.2.3-54-g00ecf