diff options
author | Chen Qi <Qi.Chen@windriver.com> | 2022-12-09 01:54:23 -0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2022-12-09 10:39:27 -0800 |
commit | 15893f46f8af8c91d922fa41f9a1f537d92aeb9a (patch) | |
tree | 23b1dbf1b8093d6b4f66929e9233719fee47fd47 | |
parent | 178123a0066c40db1e75d018dc65f056fb03b826 (diff) | |
download | meta-openembedded-15893f46f8af8c91d922fa41f9a1f537d92aeb9a.tar.gz |
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 <Qi.Chen@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r-- | meta-networking/recipes-connectivity/networkmanager/networkmanager_1.40.0.bb | 4 |
1 files 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 110b499aa..b9273ac89 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() { | |||
295 | 295 | ||
296 | # Enable iwd if compiled | 296 | # Enable iwd if compiled |
297 | if ${@bb.utils.contains('PACKAGECONFIG','iwd','true','false',d)}; then | 297 | if ${@bb.utils.contains('PACKAGECONFIG','iwd','true','false',d)}; then |
298 | install -Dm 0644 ${WORKDIR}/enable-iwd.conf ${D}${libdir}/NetworkManager/conf.d/enable-iwd.conf | 298 | install -Dm 0644 ${WORKDIR}/enable-iwd.conf ${D}${nonarch_libdir}/NetworkManager/conf.d/enable-iwd.conf |
299 | fi | 299 | fi |
300 | 300 | ||
301 | # Enable dhcpd if compiled | 301 | # Enable dhcpd if compiled |
302 | if ${@bb.utils.contains('PACKAGECONFIG','dhcpcd','true','false',d)}; then | 302 | if ${@bb.utils.contains('PACKAGECONFIG','dhcpcd','true','false',d)}; then |
303 | install -Dm 0644 ${WORKDIR}/enable-dhcpcd.conf ${D}${libdir}/NetworkManager/conf.d/enable-dhcpcd.conf | 303 | install -Dm 0644 ${WORKDIR}/enable-dhcpcd.conf ${D}${nonarch_libdir}/NetworkManager/conf.d/enable-dhcpcd.conf |
304 | fi | 304 | fi |
305 | } | 305 | } |