6 files changed, 46 insertions, 20 deletions

diff --git a/recipes-extended/libpkcs11/libpkcs11_git.bb b/recipes-extended/libpkcs11/libpkcs11_git.bb
index 2f97de27e..28bb817f8 100644
--- a/recipes-extended/libpkcs11/libpkcs11_git.bb
+++ b/recipes-extended/libpkcs11/libpkcs11_git.bb
@@ -1,15 +1,17 @@
-DESCRIPTION = "PKCS library"
+SUMMARY = "PKCS#11 cryptographic token library"
+DESCRIPTION = "PKCS#11 library implementing cryptographic token operations \
+               backed by the NXP QorIQ secure object (secure-obj) subsystem."
 HOMEPAGE = "https://github.com/nxp-qoriq/libpkcs11"
+SECTION = "libs"
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=803852533e29eb1d6d5e55ad3078b625"
+DEPENDS = "openssl secure-obj"
 
 SRC_URI = "git://github.com/nxp-qoriq/libpkcs11;protocol=https;nobranch=1 \
            file://0001-fix-multiple-definition-error.patch \
 "
 SRCREV = "8d85182b7a7cd393ab6dd72930f8d1b69468f741"
 
-DEPENDS = "openssl secure-obj"
-
 WRAP_TARGET_PREFIX ?= "${TARGET_PREFIX}"
 export CROSS_COMPILE_HOST = "${CROSS_COMPILE}"
 export CROSS_COMPILE_TA = "${CROSS_COMPILE}"
@@ -25,15 +27,21 @@ do_compile() {
 }
 
 do_install(){
-    mkdir -p ${D}/${libdir}
-    mkdir -p ${D}/${includedir} ${D}/${bindir}
-    cp ${S}/out/export/lib/libpkcs11.so  ${D}/${libdir}
-    cp ${S}/out/export/include/*.h  ${D}/${includedir}
+    install -d ${D}${libdir}
+    install -d ${D}${includedir}
+    install -d ${D}${bindir}
+    install -m 0755 ${S}/out/export/lib/libpkcs11.so ${D}${libdir}
+    install -m 0644 ${S}/out/export/include/*.h ${D}${includedir}
     rm -f ${D}${includedir}/pkcs11.h
-    cp ${S}/out/export/app/*  ${D}/${bindir}
+    install -m 0755 ${S}/out/export/app/* ${D}${bindir}
 }
 
 PARALLEL_MAKE = ""
+
+# The library links against sysroot libraries and ships its .so in the main
+# package, so the ldflags/dev-deps/dev-elf QA checks do not apply cleanly here.
+# nooelint: oelint.vars.insaneskip
 INSANE_SKIP:${PN} = "ldflags dev-deps"
+# nooelint: oelint.vars.insaneskip
 INSANE_SKIP:${PN}-dev = "ldflags dev-elf"
 COMPATIBLE_MACHINE = "(qoriq-arm64)"
diff --git a/recipes-extended/odp/odp/0001-Fix-this-build-error.patch b/recipes-extended/odp/files/0001-Fix-this-build-error.patch
index cebd7da16..cebd7da16 100644
--- a/recipes-extended/odp/odp/0001-Fix-this-build-error.patch
+++ b/recipes-extended/odp/files/0001-Fix-this-build-error.patch
diff --git a/recipes-extended/odp/odp.inc b/recipes-extended/odp/odp.inc
index adfd936d7..a730ccd47 100644
--- a/recipes-extended/odp/odp.inc
+++ b/recipes-extended/odp/odp.inc
@@ -6,8 +6,6 @@ SECTION = "console/network"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=ca6103dc75397fb6bec596187d6b7829"
 
-FILESEXTRAPATHS:prepend := "${THISDIR}/odp:"
-
 SRC_URI = "\
     git://github.com/nxp-qoriq/odp;protocol=https;nobranch=1 \
     git://github.com/nxp-qoriq/qbman_userspace;protocol=https;nobranch=1;name=qbman;destsuffix=${S}/platform/linux-dpaa2/flib/qbman \
diff --git a/recipes-extended/odp/odp_git.bb b/recipes-extended/odp/odp_git.bb
index e531515b1..dc19a82ab 100644
--- a/recipes-extended/odp/odp_git.bb
+++ b/recipes-extended/odp/odp_git.bb
@@ -2,12 +2,11 @@ require odp.inc
 
 inherit autotools-brokensep
 
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
+# odp.inc does not set DEPENDS, so this is the canonical definition rather than
+# an override after the require.
+# nooelint: oelint.vars.dependsappend
 DEPENDS = "cunit libxml2 openssl"
 
-RDEPENDS:${PN} = "bash libcrypto libssl odp-counters odp-module"
-
 ODP_SOC ?= ""
 ODP_SOC:ls1043ardb = "LS1043"
 ODP_SOC:ls1046ardb = "LS1046"
@@ -17,6 +16,8 @@ ODP_BUILD_TYPE:ls1043ardb = "ls1043"
 ODP_BUILD_TYPE:ls1046ardb = "ls1046"
 ODP_BUILD_TYPE:ls1088ardb = "ls1088"
 
+PACKAGECONFIG[perf] = "--enable-test-perf,,,"
+
 EXTRA_OECONF = "--with-platform=${ODP_PLATFORM} \
                 --enable-test-vald \
                 --enable-test-perf \
@@ -31,7 +32,7 @@ CFLAGS += "-Wno-format-truncation -Wno-maybe-uninitialized -Wno-implicit-fallthr
            -Wno-stringop-truncation \
 "
 
-PACKAGECONFIG[perf] = "--enable-test-perf,,,"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 do_configure:prepend () {
     export SOC=${ODP_SOC}
@@ -60,3 +61,5 @@ do_install:append () {
 FILES:${PN}-staticdev += "${datadir}/opendataplane/*.la"
 FILES:${PN} += "/usr/odp/bin /usr/odp/scripts /usr/odp/debug /usr/odp/test/validation /usr/odp/test/performance /usr/odp/test/miscellaneous /usr/odp/test/api_test"
 FILES:${PN}-dbg += "/usr/odp/bin/.debug /usr/odp/debug/.debug /usr/odp/test/validation/.debug /usr/odp/test/performance/.debug /usr/odp/test/miscellaneous/.debug /usr/odp/test/api_test/.debug"
+
+RDEPENDS:${PN} = "bash libcrypto libssl odp-counters odp-module"
diff --git a/recipes-extended/ovs-dpdk/ovs-dpdk_3.1.bb b/recipes-extended/ovs-dpdk/ovs-dpdk_3.1.bb
index 263f1c12c..8aaf0a638 100644
--- a/recipes-extended/ovs-dpdk/ovs-dpdk_3.1.bb
+++ b/recipes-extended/ovs-dpdk/ovs-dpdk_3.1.bb
@@ -1,16 +1,18 @@
-DESCRIPTION = "Open Virtual switch based on DPDK"
+SUMMARY = "Open vSwitch accelerated with DPDK"
+DESCRIPTION = "Open vSwitch (multilayer virtual switch) built on top of DPDK for \
+               fast userspace packet forwarding on NXP QorIQ platforms."
 HOMEPAGE = "https://github.com/nxp-qoriq/ovs-dpdk"
+SECTION = "networking"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=1ce5d23a6429dff345518758f13aaeab"
 
 DEPENDS = "autoconf-native automake-native coreutils-native dpdk python3-six-native"
-RDEPENDS:${PN} = "bash libcrypto libssl python3"
-
-inherit python3native pkgconfig
 
 SRC_URI = "git://github.com/nxp-qoriq/ovs-dpdk;protocol=https;nobranch=1"
 SRCREV = "7b4861e1f77bbea5ff9952717b66362fdecbca4d"
 
+inherit python3native pkgconfig
+
 do_configure() {
     export SYSROOT_DPDK=${PKG_CONFIG_SYSROOT_DIR}
     ${S}/boot.sh
@@ -28,10 +30,18 @@ do_install:append() {
     install -m 0755 ${S}/utilities/ovs-ofctl ${D}${bindir}/ovs-dpdk
 }
 
+# The upstream build hardcodes cross host/CFLAGS paths, so the produced
+# binaries embed build paths that cannot be scrubbed; skip the buildpaths QA
+# check rather than fail packaging.
+# nooelint: oelint.vars.insaneskip
 INSANE_SKIP:${PN}-dbg += "buildpaths"
+# nooelint: oelint.vars.insaneskip
 INSANE_SKIP:${PN} += "buildpaths"
 
 ALLOW_EMPTY:${PN} = "1"
 INHIBIT_PACKAGE_STRIP = "1"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+RDEPENDS:${PN} = "bash libcrypto libssl python3"
+
 COMPATIBLE_MACHINE = "(qoriq-arm64)"
diff --git a/recipes-extended/pktgen-dpdk/pktgen-dpdk_21.05.0.bb b/recipes-extended/pktgen-dpdk/pktgen-dpdk_21.05.0.bb
index 49a506a13..1de851ac8 100644
--- a/recipes-extended/pktgen-dpdk/pktgen-dpdk_21.05.0.bb
+++ b/recipes-extended/pktgen-dpdk/pktgen-dpdk_21.05.0.bb
@@ -1,5 +1,9 @@
-DESCRIPTION = "PKTGEN DPDK"
+SUMMARY = "Traffic generator powered by DPDK"
+DESCRIPTION = "Pktgen is a high-performance software traffic generator built on \
+               the DPDK fast packet processing framework, used to send and \
+               receive test traffic at line rate for network benchmarking."
 HOMEPAGE = "https://git.dpdk.org/apps/pktgen-dpdk/"
+SECTION = "console/network"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=0245ceedaef59ae0129500b0ce1e8a45"
 
@@ -29,6 +33,9 @@ do_install() {
     install -m 0644 ${S}/Pktgen.lua ${D}${bindir}/
 }
 
+# DPDK's meson build links the app without propagating the distro LDFLAGS,
+# so the ldflags QA check is skipped for this package.
+# nooelint: oelint.vars.insaneskip
 INSANE_SKIP:${PN} = "ldflags"
 INHIBIT_PACKAGE_STRIP = "1"
 PACKAGE_ARCH = "${MACHINE_ARCH}"