Skip to contentSkip to conversation

iwd: Module load dir should be relative to root_dir

PATCH In review Khem Raj 2 participants 3 messages Aug 9, 2020 – Aug 23, 2020

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/1 iwd: Module load dir should be relative to root_dir

This is autodetected by configure from systemd.pc and it depends on value of root_dir ( usrmerge ) and not /usr being hardcoded eg. in nonarch_libdir this has been fixed in systemd [1]

Fixes
ERROR: iwd-1.8-r0 do_package: QA Issue: iwd: Files/directories were installed but not shipped in any package:
/lib/modules-load.d
/lib/modules-load.d/pkcs8.conf

[1] https://github.com/systemd/systemd/commit/4a56315a990b802860170ecd1bbd3eb68e14a38b

---
 meta-oe/recipes-connectivity/iwd/iwd_1.8.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-oe/recipes-connectivity/iwd/iwd_1.8.bb +1 -1
index bfbf3c7fa6..b1e6fea2ff 100644
@@ -41,7 +41,7 @@ do_install_append() {
 
 FILES_${PN} += " \
     ${datadir}/dbus-1 \
-    ${nonarch_libdir}/modules-load.d \
+    ${nonarch_base_libdir}/modules-load.d \
     ${systemd_unitdir}/network \
 "
 
Signature · 1 line
2.28.0
#1 lore raw

It doesn't correctly respect nonarch_base_libdir variable when installing the file.

With this change applied I'm seeing:
ERROR: iwd-1.8-r0 do_package: QA Issue: iwd: Files/directories were installed but not shipped in any package:
/usr/lib
/usr/lib/modules-load.d
/usr/lib/modules-load.d/pkcs8.conf
Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install.
iwd: 3 installed and not shipped files. [installed-vs-shipped]

possibly because of using usrmerge DISTRO_FEATURE in this build.

Will check and send follow-up.

Quoted 37 lines · Khem Raj

This is autodetected by configure from systemd.pc and it depends on value of root_dir ( usrmerge ) and not /usr being hardcoded eg. in nonarch_libdir this has been fixed in systemd [1]

Fixes
ERROR: iwd-1.8-r0 do_package: QA Issue: iwd: Files/directories were installed but not shipped in any package:
/lib/modules-load.d
/lib/modules-load.d/pkcs8.conf

[1]
https://github.com/systemd/systemd/commit/4a56315a990b802860170ecd1bbd3eb68e14a38b

---
 meta-oe/recipes-connectivity/iwd/iwd_1.8.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-oe/recipes-connectivity/iwd/iwd_1.8.bb +1 -2
index bfbf3c7fa6..b1e6fea2ff 100644
@@ -41,7 +41,7 @@ do_install_append() {
 
 FILES_${PN} += " \
     ${datadir}/dbus-1 \
-    ${nonarch_libdir}/modules-load.d \
+    ${nonarch_base_libdir}/modules-load.d \
     ${systemd_unitdir}/network \
 "
 
--

2.28.0

author
#2 lore raw

Yes I have a revert staged in master-next

Quoted 128 lines · Martin Jansa

It doesn't correctly respect nonarch_base_libdir variable when installing the file.

With this change applied I'm seeing:
ERROR: iwd-1.8-r0 do_package: QA Issue: iwd: Files/directories were installed but not shipped in any package:
/usr/lib
/usr/lib/modules-load.d
/usr/lib/modules-load.d/pkcs8.conf
Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install.
iwd: 3 installed and not shipped files. [installed-vs-shipped]

possibly because of using usrmerge DISTRO_FEATURE in this build.

Will check and send follow-up.

Quoted 105 lines · Khem Raj

This is autodetected by configure from systemd.pc and it depends on

value of root_dir ( usrmerge ) and not /usr being hardcoded eg. in

nonarch_libdir this has been fixed in systemd [1]

Fixes

ERROR: iwd-1.8-r0 do_package: QA Issue: iwd: Files/directories were installed but not shipped in any package:

/lib/modules-load.d

/lib/modules-load.d/pkcs8.conf

[1]
https://github.com/systemd/systemd/commit/4a56315a990b802860170ecd1bbd3eb68e14a38b

---

 meta-oe/recipes-connectivity/iwd/iwd_1.8.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-oe/recipes-connectivity/iwd/iwd_1.8.bb +0 -0

index bfbf3c7fa6..b1e6fea2ff 100644

--- a/meta-oe/recipes-connectivity/iwd/iwd_1.8.bb

+++ b/meta-oe/recipes-connectivity/iwd/iwd_1.8.bb

meta-oe/recipes-connectivity/iwd/iwd_1.8.bb +0 -0
@@ -41,7 +41,7 @@ do_install_append() {
 
 
 
 
 
 FILES_${PN} += " \
 
     ${datadir}/dbus-1 \
meta-oe/recipes-connectivity/iwd/iwd_1.8.bb +1 -2
-    ${nonarch_libdir}/modules-load.d \
 
 
+    ${nonarch_base_libdir}/modules-load.d \
 
 
     ${systemd_unitdir}/network \
 
 
 "
 
 
 
 
 
 
 
--

2.28.0