From fe187c070f06c56a28416da339591ad3c4b6e9c8 Mon Sep 17 00:00:00 2001
From: Max Krummenacher <max.krummenacher@toradex.com>
Date: Mon, 26 Sep 2022 11:55:42 +0200
Subject: imx-gpu-viv: fix removing non packaged files

The for loops over the FILES:xxx variables do file expansion on the
FILES entries. As a result any file name(s) specified with a wildcard
which actually exists in the host filesystem will be replaced with
the host filesystems file name(s).

Disable file expansion for the for loop and reenable it afterwards
so that the expansion happens on the full file names with the ${D}
prefix.

E.g if the host has /usr/lib/libOpenCL.so.1, then
/usr/lib/libOpenCL.so.* gets expanded to /usr/lib/libOpenCL.so.1,
and as a result ${D}/usr/lib/libOpenCL.so.1.2, ${D}//usr/lib/libOpenCL.so.3 ...
will not be deleted.

Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
---
 recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'recipes-graphics/imx-gpu-viv')

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 90b11861..0702600c 100644
--- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
+++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
@@ -213,7 +213,9 @@ do_install () {
         # Framebuffer backend for i.MX 8 and beyond
         install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/egl.pc         ${D}${libdir}/pkgconfig/egl.pc
         cp -r ${S}/gpu-core/usr/lib/wayland/* ${D}${libdir}
+        set -f
         for f in ${FILES:libvdk-imx} ${FILES:libvdk-imx-dev}; do
+            set +f
             rm -rf ${D}/$f
         done
         rm -rf \
@@ -227,7 +229,9 @@ do_install () {
     fi
 
     if [ -z "${PACKAGES_OPENCL}" ]; then
+        set -f
         for f in ${FILES:libopencl-imx} ${FILES:libopencl-imx-dev} ${FILES:libclc-imx} ${FILES:libclc-imx-dev}; do
+            set +f
             rm -rf ${D}$f
         done
         rm -rf ${D}/opt/viv_samples/cl11
@@ -238,7 +242,9 @@ do_install () {
     fi
 
     if [ -z "${PACKAGES_OPENVX}" ]; then
+        set -f
         for f in ${FILES:libopenvx-imx} ${FILES:libopenvx-imx-dev}; do
+            set +f
             rm -rf ${D}$f
         done
     fi
@@ -254,7 +260,9 @@ do_install () {
         ln -s libvulkan_VSI.so.$FULL ${D}${libdir}/libvulkan_VSI.so.$MAJOR
         ln -s libvulkan_VSI.so.$FULL ${D}${libdir}/libvulkan_VSI.so
         if [ -z "${PACKAGES_VULKAN}" ]; then
+            set -f
             for f in ${FILES:libvulkan-imx} ${FILES:libvulkan-imx-dev}; do
+                set +f
                 rm -rf ${D}$f
             done
         fi
-- 
cgit v1.2.3-54-g00ecf