odp-module/odp-counters/kernel-module-ar: fix QA Issue during usermerge

While enabling usermerge, there is a QA issue:
...
ERROR: odp-counters-git-r0 do_package: QA Issue: odp-counters: Files/directories were installed but not shipped in any package:
  /lib
  /lib/modules
  /lib/modules/5.10.70-yocto-standard
  /lib/modules/5.10.70-yocto-standard/odp
  /lib/modules/5.10.70-yocto-standard/odp/odpfsl_perfcounters.ko
Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install.
odp-counters: 5 installed and not shipped files. [installed-vs-shipped]
...

Use Yocto nonarch_base_libdir to replace hardcode /lib

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>

diff --git a/recipes-extended/odp/odp-counters_git.bb b/recipes-extended/odp/odp-counters_git.bb
index 9d88ea43edee5cab42b3c63c7ddd9062080064e0..c8f132088c35d0141735ad0df92833ba777ee05f 100644 (file)
--- a/recipes-extended/odp/odp-counters_git.bb
+++ b/recipes-extended/odp/odp-counters_git.bb
@@ -9,6 +9,6 @@ do_compile:prepend () {
 }
 
 do_install () {
-    install -d ${D}/lib/modules/${KERNEL_VERSION}/odp
-    install -m 755 ${S}/test/debug/perf_counters/odpfsl_perfcounters.ko ${D}/lib/modules/${KERNEL_VERSION}/odp
+    install -d ${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/odp
+    install -m 755 ${S}/test/debug/perf_counters/odpfsl_perfcounters.ko ${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/odp
 }

diff --git a/recipes-extended/odp/odp-module_git.bb b/recipes-extended/odp/odp-module_git.bb
index 0748e5bf5441a861ab2fa22d6a6818021a1c7d89..ba74a5c00f90c1d31bbac7268d59aadabeb64546 100644 (file)
--- a/recipes-extended/odp/odp-module_git.bb
+++ b/recipes-extended/odp/odp-module_git.bb
@@ -9,8 +9,8 @@ do_compile:prepend () {
 }
 
 do_install () {
-    install -d ${D}/lib/modules/${KERNEL_VERSION}/odp
-    install -m 755 ${S}/kern/odpfsl_kni.ko ${D}/lib/modules/${KERNEL_VERSION}/odp
+    install -d ${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/odp
+    install -m 755 ${S}/kern/odpfsl_kni.ko ${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/odp
 }
 
 PKG:${PN} = "kernel-module-${PN}"

diff --git a/recipes-kernel/kernel-modules/kernel-module-ar_git.bb b/recipes-kernel/kernel-modules/kernel-module-ar_git.bb
index f2cd1a579b97e0eae603037f7c02378849cb7568..898afeb2f6312fe2e13e35f828b1bcd06a71d931 100644 (file)
--- a/recipes-kernel/kernel-modules/kernel-module-ar_git.bb
+++ b/recipes-kernel/kernel-modules/kernel-module-ar_git.bb
@@ -19,9 +19,9 @@ do_compile:prepend() {
 }
 
 do_install(){
-       install -d ${D}/lib/modules/${KERNEL_VERSION}
+       install -d ${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}
        install -d ${D}${bindir}
-       install -m 644 ${B}/bin/ar.ko ${D}/lib/modules/${KERNEL_VERSION}/
+       install -m 644 ${B}/bin/ar.ko ${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/
        cp -f ${S}/bin/ar_* ${D}${bindir}/ 
 }