From 64f39e155653938b56d4b5f772ec76e8c9c0cd16 Mon Sep 17 00:00:00 2001
From: Max Krummenacher <max.krummenacher@toradex.com>
Date: Wed, 21 Sep 2022 18:10:08 +0200
Subject: imx-gpu-viv: remove vulkan files if not packaged

For the i.MX 8M Mini the GPU doesn't provide the Vulkan API and thus
the Vulkan libs are not installed. Delete them in that case from the
install directory to prevent the following build time error:

| ERROR: imx-gpu-viv-1_6.4.3.p4.2-aarch64-r0 do_package: QA Issue: imx-gpu-viv: Files/directories were installed but not shipped in any package:
|   /usr/lib/libvulkan.so.1.2.1
|   /usr/lib/libvulkan.so.1

Once the above files are deleted from ${D} I additionally get:

| ERROR: imx-gpu-viv-1_6.4.3.p4.2-aarch64-r0 do_package_qa: QA Issue: -dev package imx-gpu-viv-dev contains non-symlink .so '/usr/lib/libSPIRV_viv.so' [dev-elf]

Why it is not in the list of the `installed but not shipped`files
I do not know, but as libSPIRV_viv is also packaged into the vulkan
packages let's delete it too.

Fixes: ee92b5a8 ("imx-gpu-viv: Mark libvulkan-imx unavailable for 8M Mini")
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
(cherry picked from commit e55eda8b7f590ee07c5cb6c6605b7167c70456dd)
---
 recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
index dcfb049b..242ed758 100644
--- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
+++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
@@ -212,15 +212,19 @@ do_install () {
         cp ${S}/gpu-core/usr/lib/fb/libVDK.so.1.2.0 ${D}${libdir}/libVDK-fb.so.1.2.0
     fi
     if [ "${IS_MX8}" = "1" ]; then
-        # Rename the vulkan implementation library which is wrapped by the vulkan-loader
-        # library of the same name
-        MAJOR=${LIBVULKAN_VERSION_MAJOR}
-        FULL=${LIBVULKAN_VERSION}
-        mv ${D}${libdir}/libvulkan.so.$FULL ${D}${libdir}/libvulkan_VSI.so.$FULL
-        patchelf --set-soname libvulkan_VSI.so.$MAJOR ${D}${libdir}/libvulkan_VSI.so.$FULL
-        rm ${D}${libdir}/libvulkan.so.$MAJOR ${D}${libdir}/libvulkan.so
-        ln -s libvulkan_VSI.so.$FULL ${D}${libdir}/libvulkan_VSI.so.$MAJOR
-        ln -s libvulkan_VSI.so.$FULL ${D}${libdir}/libvulkan_VSI.so
+        if [ -n "${PACKAGES_VULKAN}" ]; then
+            # Rename the vulkan implementation library which is wrapped by the vulkan-loader
+            # library of the same name
+            MAJOR=${LIBVULKAN_VERSION_MAJOR}
+            FULL=${LIBVULKAN_VERSION}
+            mv ${D}${libdir}/libvulkan.so.$FULL ${D}${libdir}/libvulkan_VSI.so.$FULL
+            patchelf --set-soname libvulkan_VSI.so.$MAJOR ${D}${libdir}/libvulkan_VSI.so.$FULL
+            rm ${D}${libdir}/libvulkan.so.$MAJOR ${D}${libdir}/libvulkan.so
+            ln -s libvulkan_VSI.so.$FULL ${D}${libdir}/libvulkan_VSI.so.$MAJOR
+            ln -s libvulkan_VSI.so.$FULL ${D}${libdir}/libvulkan_VSI.so
+        else
+            rm -f ${D}${libdir}/libvulkan.so* ${D}${libdir}/libSPIRV_viv${SOLIBS}*
+        fi
     fi
 
     # FIXME: MX6SL does not have 3D support; hack it for now
-- 
cgit v1.2.3-54-g00ecf