Merge pull request #2575 from lucianogdittgen/oelint-cleanup-11-recipe-metadata-7

oelint: Recipe metadata, do_install and split-package FILES cleanups

2 files changed, 20 insertions, 13 deletions

diff --git a/recipes-graphics/drm/libdrm_2.4.127.imx.bb b/recipes-graphics/drm/libdrm_2.4.127.imx.bb
index 685e3f04a..de96d72e1 100644
--- a/recipes-graphics/drm/libdrm_2.4.127.imx.bb
+++ b/recipes-graphics/drm/libdrm_2.4.127.imx.bb
@@ -46,15 +46,15 @@ PACKAGES =+ "${PN}-tests ${PN}-drivers ${PN}-radeon ${PN}-nouveau ${PN}-omap \
              ${PN}-intel ${PN}-exynos ${PN}-freedreno ${PN}-amdgpu \
              ${PN}-etnaviv"
 
-FILES:${PN}-tests = "${bindir}/*"
-FILES:${PN}-radeon = "${libdir}/libdrm_radeon.so.*"
-FILES:${PN}-nouveau = "${libdir}/libdrm_nouveau.so.*"
-FILES:${PN}-omap = "${libdir}/libdrm_omap.so.*"
-FILES:${PN}-intel = "${libdir}/libdrm_intel.so.*"
-FILES:${PN}-exynos = "${libdir}/libdrm_exynos.so.*"
-FILES:${PN}-freedreno = "${libdir}/libdrm_freedreno.so.*"
-FILES:${PN}-amdgpu = "${libdir}/libdrm_amdgpu.so.* ${datadir}/${PN}/amdgpu.ids"
-FILES:${PN}-etnaviv = "${libdir}/libdrm_etnaviv.so.*"
+FILES:${PN}-tests += "${bindir}/*"
+FILES:${PN}-radeon += "${libdir}/libdrm_radeon.so.*"
+FILES:${PN}-nouveau += "${libdir}/libdrm_nouveau.so.*"
+FILES:${PN}-omap += "${libdir}/libdrm_omap.so.*"
+FILES:${PN}-intel += "${libdir}/libdrm_intel.so.*"
+FILES:${PN}-exynos += "${libdir}/libdrm_exynos.so.*"
+FILES:${PN}-freedreno += "${libdir}/libdrm_freedreno.so.*"
+FILES:${PN}-amdgpu += "${libdir}/libdrm_amdgpu.so.* ${datadir}/${PN}/amdgpu.ids"
+FILES:${PN}-etnaviv += "${libdir}/libdrm_etnaviv.so.*"
 
 RRECOMMENDS:${PN}-drivers = "${PN}-radeon ${PN}-nouveau ${PN}-omap ${PN}-intel \
                              ${PN}-exynos ${PN}-freedreno ${PN}-amdgpu \
@@ -62,9 +62,13 @@ RRECOMMENDS:${PN}-drivers = "${PN}-radeon ${PN}-nouveau ${PN}-omap ${PN}-intel \
 
 BBCLASSEXTEND = "native nativesdk"
 
+# The i.MX vivante driver additions are kept together as one block.
+# nooelint: oelint.var.order.PACKAGES
 PACKAGES:prepend:imxgpu = "${PN}-vivante "
 RRECOMMENDS:${PN}-drivers:append:imxgpu = " ${PN}-vivante"
-FILES:${PN}-vivante = "${libdir}/libdrm_vivante.so.*"
+# nooelint: oelint.var.order.FILES
+FILES:${PN}-vivante += "${libdir}/libdrm_vivante.so.*"
+# nooelint: oelint.var.order.PACKAGECONFIG
 PACKAGECONFIG:append:imxgpu = " vivante"
 PACKAGECONFIG[vivante] = "-Dvivante=true,-Dvivante=false"
 
diff --git a/recipes-graphics/imx-g2d/imx-dpu-g2d_2.5.0.2.bb b/recipes-graphics/imx-g2d/imx-dpu-g2d_2.5.0.2.bb
index 4477247ab..d869a8f7b 100644
--- a/recipes-graphics/imx-g2d/imx-dpu-g2d_2.5.0.2.bb
+++ b/recipes-graphics/imx-g2d/imx-dpu-g2d_2.5.0.2.bb
@@ -9,7 +9,7 @@ SECTION = "graphics"
 LICENSE = "LicenseRef-Proprietary"
 LIC_FILES_CHKSUM = "file://COPYING;md5=bc649096ad3928ec06a8713b8d787eac"
 
-DEPENDS = "libdrm ${LIBGAL_IMX}"
+DEPENDS = "${LIBGAL_IMX} libdrm"
 LIBGAL_IMX = ""
 LIBGAL_IMX:imxviv = "libgal-imx"
 
@@ -32,12 +32,15 @@ inherit fsl-eula-unpack
 do_install () {
     install -d ${D}${libdir}
     install -d ${D}${includedir}
-    cp -d ${S}/g2d/usr/lib/*.so* ${D}${libdir}
-    cp -Pr ${S}/g2d/usr/include/* ${D}${includedir}
+    cp -R ${S}/g2d/usr/lib/*.so* ${D}${libdir}
+    cp -R ${S}/g2d/usr/include/* ${D}${includedir}
 }
 
 PACKAGE_ARCH = "${MACHINE_SOCARCH}"
 
+# musl needs gcompat for these glibc-built prebuilt blobs; their runtime
+# deps can't be mapped by QA.
+# nooelint: oelint.vars.insaneskip
 INSANE_SKIP:append:libc-musl = " file-rdeps"
 RDEPENDS:${PN}:append:libc-musl = " gcompat"