Merge pull request #2292 from OSSystems/topic/imx-gpu-viv

imx-gpu-viv: Fix the imx-gpu-viv install task

2 files changed, 5 insertions, 17 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 46e2d117a..b9fe6bb8c 100644
--- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
+++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
@@ -71,8 +71,7 @@ PE = "1"
 inherit fsl-eula-unpack
 
 FILESEXTRAPATHS:append := "${THISDIR}/imx-gpu-viv:"
-SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true \
-           file://imx_icd.json"
+SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true"
 
 S = "${WORKDIR}/${BPN}-${PV}-${IMX_SRCREV_ABBREV}"
 
@@ -184,8 +183,6 @@ IMX_SOC:mx8mq-nxp-bsp  = "mx8mq"
 IMX_SOC:mx8mn-nxp-bsp  = "mx8mn"
 IMX_SOC:mx8ulp-nxp-bsp = "mx8ulp"
 
-LIBVULKAN_API_VERSION   = "1.3.204"
-
 do_install () {
     install -d ${D}${libdir}
     install -d ${D}${includedir}
@@ -253,8 +250,7 @@ do_install () {
         rm -rf ${D}/opt/viv_samples/cl11
     else
         # Install Vendor ICDs for OpenCL's installable client driver loader (ICDs Loader)
-        install -d ${D}${sysconfdir}/OpenCL/vendors/
-        install -m 0644 ${S}/gpu-core/etc/OpenCL/vendors/Vivante.icd ${D}${sysconfdir}/OpenCL/vendors/Vivante.icd
+        install -Dm 0644 ${S}/gpu-core/etc/OpenCL/vendors/Vivante.icd ${D}${sysconfdir}/OpenCL/vendors/Vivante.icd
 
         if [ "${OPENCL_VX_INTRINSIC_EXTENSION_PACKAGES}" = "" ]; then
             rm -f ${D}${includedir}/CL/cl_viv_vx_ext.h
@@ -277,9 +273,8 @@ do_install () {
                 rm -rf ${D}$f
             done
         else
-            install -Dm 0644 ${UNPACKDIR}/imx_icd.json ${D}${sysconfdir}/vulkan/icd.d/imx_icd.json
-            sed -i "s,%libdir%,${libdir}," ${D}${sysconfdir}/vulkan/icd.d/imx_icd.json
-            sed -i "s,%api_version%,${LIBVULKAN_API_VERSION}," ${D}${sysconfdir}/vulkan/icd.d/imx_icd.json
+            install -Dm 0644 ${S}/gpu-core/etc/vulkan/icd.d/imx_icd.json ${D}${sysconfdir}/vulkan/icd.d/imx_icd.json
+            sed -i "s,/usr/lib,${libdir}," ${D}${sysconfdir}/vulkan/icd.d/imx_icd.json
         fi
     fi
 
@@ -335,7 +330,7 @@ FILES:libegl-imx-dev = "${includedir}/EGL ${includedir}/KHR ${libdir}/pkgconfig/
 INSANE_SKIP:libegl-imx += "dev-so"
 
 FILES:libgal-imx = "${libdir}/libGAL${SOLIBS} ${libdir}/libGAL_egl${SOLIBS}"
-FILES:libgal-imx-dev = "${includedir}/HAL"
+FILES:libgal-imx-dev:remove = "${includedir}/HAL"
 RDEPENDS:libgal-imx += "${@bb.utils.contains('PACKAGECONFIG', 'valgrind', 'valgrind', '', d)}"
 RPROVIDES:libgal-imx += "libgal-imx"
 RRECOMMENDS:libgal-imx += "kernel-module-imx-gpu-viv"
diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv/imx_icd.json b/recipes-graphics/imx-gpu-viv/imx-gpu-viv/imx_icd.json
deleted file mode 100644
index 21d83f945..000000000
--- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv/imx_icd.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "file_format_version": "1.0.0",
-    "ICD": {
-        "library_path": "%libdir%/libvulkan_VSI.so.1",
-        "api_version": "%api_version%"
-    }
-}