summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2021-10-20 14:47:55 +0800
committerHongxu Jia <hongxu.jia@windriver.com>2021-10-21 15:45:34 +0800
commit3d39d355867caaee00c42614f7eb4a9b0830b84b (patch)
tree3e05546180d63768facf0c4ef489c171f32beb74
parent265c7afa5c7e1491b960e5f77132a01dd6455feb (diff)
downloadmeta-freescale-3d39d355867caaee00c42614f7eb4a9b0830b84b.tar.gz
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>
-rw-r--r--recipes-extended/odp/odp-counters_git.bb4
-rw-r--r--recipes-extended/odp/odp-module_git.bb4
-rw-r--r--recipes-kernel/kernel-modules/kernel-module-ar_git.bb4
3 files changed, 6 insertions, 6 deletions
diff --git a/recipes-extended/odp/odp-counters_git.bb b/recipes-extended/odp/odp-counters_git.bb
index 9d88ea43..c8f13208 100644
--- a/recipes-extended/odp/odp-counters_git.bb
+++ b/recipes-extended/odp/odp-counters_git.bb
@@ -9,6 +9,6 @@ do_compile:prepend () {
9} 9}
10 10
11do_install () { 11do_install () {
12 install -d ${D}/lib/modules/${KERNEL_VERSION}/odp 12 install -d ${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/odp
13 install -m 755 ${S}/test/debug/perf_counters/odpfsl_perfcounters.ko ${D}/lib/modules/${KERNEL_VERSION}/odp 13 install -m 755 ${S}/test/debug/perf_counters/odpfsl_perfcounters.ko ${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/odp
14} 14}
diff --git a/recipes-extended/odp/odp-module_git.bb b/recipes-extended/odp/odp-module_git.bb
index 0748e5bf..ba74a5c0 100644
--- a/recipes-extended/odp/odp-module_git.bb
+++ b/recipes-extended/odp/odp-module_git.bb
@@ -9,8 +9,8 @@ do_compile:prepend () {
9} 9}
10 10
11do_install () { 11do_install () {
12 install -d ${D}/lib/modules/${KERNEL_VERSION}/odp 12 install -d ${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/odp
13 install -m 755 ${S}/kern/odpfsl_kni.ko ${D}/lib/modules/${KERNEL_VERSION}/odp 13 install -m 755 ${S}/kern/odpfsl_kni.ko ${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/odp
14} 14}
15 15
16PKG:${PN} = "kernel-module-${PN}" 16PKG:${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 f2cd1a57..898afeb2 100644
--- 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() {
19} 19}
20 20
21do_install(){ 21do_install(){
22 install -d ${D}/lib/modules/${KERNEL_VERSION} 22 install -d ${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}
23 install -d ${D}${bindir} 23 install -d ${D}${bindir}
24 install -m 644 ${B}/bin/ar.ko ${D}/lib/modules/${KERNEL_VERSION}/ 24 install -m 644 ${B}/bin/ar.ko ${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/
25 cp -f ${S}/bin/ar_* ${D}${bindir}/ 25 cp -f ${S}/bin/ar_* ${D}${bindir}/
26} 26}
27 27