summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Krummenacher <max.krummenacher@toradex.com>2022-09-26 11:55:42 +0200
committergithub-actions[bot] <github-actions[bot]@users.noreply.github.com>2022-09-29 18:27:09 +0000
commita04dd567bbdeec733ee4e6e45bd4deaa014b5700 (patch)
tree33e9cdb3e9365a1c5af2d4275cf706a17469f1f2
parentfbf64a18d20d323fb662d2d6bb7e680e75adb99c (diff)
downloadmeta-freescale-a04dd567bbdeec733ee4e6e45bd4deaa014b5700.tar.gz
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> (cherry picked from commit fe187c070f06c56a28416da339591ad3c4b6e9c8)
-rw-r--r--recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc8
1 files changed, 8 insertions, 0 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 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 () {
213 # Framebuffer backend for i.MX 8 and beyond 213 # Framebuffer backend for i.MX 8 and beyond
214 install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/egl.pc ${D}${libdir}/pkgconfig/egl.pc 214 install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/egl.pc ${D}${libdir}/pkgconfig/egl.pc
215 cp -r ${S}/gpu-core/usr/lib/wayland/* ${D}${libdir} 215 cp -r ${S}/gpu-core/usr/lib/wayland/* ${D}${libdir}
216 set -f
216 for f in ${FILES:libvdk-imx} ${FILES:libvdk-imx-dev}; do 217 for f in ${FILES:libvdk-imx} ${FILES:libvdk-imx-dev}; do
218 set +f
217 rm -rf ${D}/$f 219 rm -rf ${D}/$f
218 done 220 done
219 rm -rf \ 221 rm -rf \
@@ -227,7 +229,9 @@ do_install () {
227 fi 229 fi
228 230
229 if [ -z "${PACKAGES_OPENCL}" ]; then 231 if [ -z "${PACKAGES_OPENCL}" ]; then
232 set -f
230 for f in ${FILES:libopencl-imx} ${FILES:libopencl-imx-dev} ${FILES:libclc-imx} ${FILES:libclc-imx-dev}; do 233 for f in ${FILES:libopencl-imx} ${FILES:libopencl-imx-dev} ${FILES:libclc-imx} ${FILES:libclc-imx-dev}; do
234 set +f
231 rm -rf ${D}$f 235 rm -rf ${D}$f
232 done 236 done
233 rm -rf ${D}/opt/viv_samples/cl11 237 rm -rf ${D}/opt/viv_samples/cl11
@@ -238,7 +242,9 @@ do_install () {
238 fi 242 fi
239 243
240 if [ -z "${PACKAGES_OPENVX}" ]; then 244 if [ -z "${PACKAGES_OPENVX}" ]; then
245 set -f
241 for f in ${FILES:libopenvx-imx} ${FILES:libopenvx-imx-dev}; do 246 for f in ${FILES:libopenvx-imx} ${FILES:libopenvx-imx-dev}; do
247 set +f
242 rm -rf ${D}$f 248 rm -rf ${D}$f
243 done 249 done
244 fi 250 fi
@@ -254,7 +260,9 @@ do_install () {
254 ln -s libvulkan_VSI.so.$FULL ${D}${libdir}/libvulkan_VSI.so.$MAJOR 260 ln -s libvulkan_VSI.so.$FULL ${D}${libdir}/libvulkan_VSI.so.$MAJOR
255 ln -s libvulkan_VSI.so.$FULL ${D}${libdir}/libvulkan_VSI.so 261 ln -s libvulkan_VSI.so.$FULL ${D}${libdir}/libvulkan_VSI.so
256 if [ -z "${PACKAGES_VULKAN}" ]; then 262 if [ -z "${PACKAGES_VULKAN}" ]; then
263 set -f
257 for f in ${FILES:libvulkan-imx} ${FILES:libvulkan-imx-dev}; do 264 for f in ${FILES:libvulkan-imx} ${FILES:libvulkan-imx-dev}; do
265 set +f
258 rm -rf ${D}$f 266 rm -rf ${D}$f
259 done 267 done
260 fi 268 fi