From 265c7afa5c7e1491b960e5f77132a01dd6455feb Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Wed, 20 Oct 2021 14:38:56 +0800 Subject: dce: fix QA Issue during usermerge While enabling usermerge, there is a QA issue: ... ERROR: dce-git-r0 do_package: QA Issue: dce: Files/directories were installed but not shipped in any package: /sbin/dce-api-perf-test /sbin/dce-example Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install. ... Use Yocto base_sbindir to replace hardcode ./sbin Signed-off-by: Hongxu Jia --- recipes-dpaa2/dce/dce_git.bb | 1 + .../dce/files/0001-support-user-merge.patch | 31 ++++++++++++++++++++++ 2 files changed, 32 insertions(+) create mode 100644 recipes-dpaa2/dce/files/0001-support-user-merge.patch diff --git a/recipes-dpaa2/dce/dce_git.bb b/recipes-dpaa2/dce/dce_git.bb index 24b39a0b3..368e5aa68 100644 --- a/recipes-dpaa2/dce/dce_git.bb +++ b/recipes-dpaa2/dce/dce_git.bb @@ -5,6 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=956df5ea6cfe0a1dcf2dee7ca37c0cdf" SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/dce;nobranch=1 \ git://source.codeaurora.org/external/qoriq/qoriq-components/qbman_userspace;nobranch=1;name=qbman;destsuffix=git/lib/qbman_userspace \ + file://0001-support-user-merge.patch \ " SRCREV = "9db9c08379aa89f45f514f4f3f0a8e8212198758" SRCREV_qbman = "2f92993a9f34e5221d6b36c63b9e30ef703e9ac3" diff --git a/recipes-dpaa2/dce/files/0001-support-user-merge.patch b/recipes-dpaa2/dce/files/0001-support-user-merge.patch new file mode 100644 index 000000000..33b351a1e --- /dev/null +++ b/recipes-dpaa2/dce/files/0001-support-user-merge.patch @@ -0,0 +1,31 @@ +From d4aa7f64db5841242257c5b30dd652afd0f6ff68 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia +Date: Wed, 20 Oct 2021 14:00:35 +0800 +Subject: [PATCH] support user merge + +Use Yocto base_sbindir to replace hardcode ./sbin + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Hongxu Jia +--- + Makefile | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 62eff25..18b79b1 100644 +--- a/Makefile ++++ b/Makefile +@@ -25,7 +25,8 @@ CFLAGS += -fdiagnostics-color + + LDFLAGS = -static -Wl,--hash-style=gnu ${EXTRA_CFLAGS} + +-PREFIX = $(DESTDIR)/sbin ++base_sbindir ?= ./sbin ++PREFIX = $(DESTDIR)/${base_sbindir} + + HEADER_DEPENDENCIES = $(subst .o,.d,$(OBJS)) + +-- +2.27.0 + -- cgit v1.2.3-54-g00ecf From 3d39d355867caaee00c42614f7eb4a9b0830b84b Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Wed, 20 Oct 2021 14:47:55 +0800 Subject: 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 --- recipes-extended/odp/odp-counters_git.bb | 4 ++-- recipes-extended/odp/odp-module_git.bb | 4 ++-- recipes-kernel/kernel-modules/kernel-module-ar_git.bb | 4 ++-- 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 9d88ea43e..c8f132088 100644 --- 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 0748e5bf5..ba74a5c00 100644 --- 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 f2cd1a579..898afeb2f 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() { } 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}/ } -- cgit v1.2.3-54-g00ecf