imx-gpu-viv: Fix regression when running some userspace applications

The imx-gpu-viv does a very bad work regarding the soname handling of
its libraries so we need to do a lot of hacks providing '.so' files for
use by the application.

This comes after revert of aa552127 "imx-gpu-viv: Fix packaging for various libraries"

An example of the error can be seen below:

,----[ strace log ]
| openat(AT_FDCWD, "/usr/lib/libEGL.so", O_RDONLY|O_CLOEXEC) = -1 ENOENT (No such file or directory)
| openat(AT_FDCWD, "/lib/libGLESv1_CM.so", O_RDONLY|O_CLOEXEC) = -1 ENOENT (No such file or directory)
| openat(AT_FDCWD, "/usr/lib/libGLESv1_CM.so", O_RDONLY|O_CLOEXEC) = -1 ENOENT (No such file or directory)
| openat(AT_FDCWD, "/lib/libGLESv2.so", O_RDONLY|O_CLOEXEC) = -1 ENOENT (No such file or directory)
| openat(AT_FDCWD, "/usr/lib/libGLESv2.so", O_RDONLY|O_CLOEXEC) = -1 ENOENT (No such file or directory)
`----

This commit are the extra fixes which was need due to new files on the
new imx-gpu-viv release to fix the following build error:

,----[ Packaging error ]
| ERROR: imx-gpu-viv-1_6.4.0.p2.4-aarch32-r0 do_package: QA Issue:
| imx-gpu-viv: Files/directories were installed but not shipped in any
| package:
|   /usr/lib/libOpenCL.so.1
|   /usr/lib/libOpenCL.so.1.2
`----

as well as:

,----[ Packaging error ]
| ERROR: imx-gpu-viv-1_6.4.0.p2.4-aarch64-r0 do_package: QA Issue:
| imx-gpu-viv: Files/directories were installed but not shipped in any
| package:
|  /usr/lib/libOpenVX.so.1.2
|  /usr/lib/libOpenVX.so.1
`----

and finally:

,----[ Packaging error ]
| ERROR: imx-gpu-viv-1_6.4.0.p2.4-aarch64-r0 do_package_qa: QA Issue: non
| -dev/-dbg/nativesdk- package contains symlink .so: libopencl-imx path
| '/work/aarch64-mx8m-fslc-linux/imx-gpu-viv/1_6.4.0.p2.4-aarch64-r0/packages-split/libopencl-imx/usr/lib/libOpenCL.so'
| [dev-so]
`----

Reported-by: Gary Bisson <gary.bisson@boundarydevices.com>
Change-Id: I785a69c0592a3c5fda9fd14a7dc8cf35b2b94d08
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Tested-by: Gary Bisson <gary.bisson@boundarydevices.com>
(cherry picked from commit 98eb5673ba2ae2b6cb91dd760511e3bcaae11c1d)

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 414f98b207de000a16b8dca2e43e50b0599da873..efafe78ddf6d8ddee7eddde594eb4eb9ad93b2f4 100644 (file)
--- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
+++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
@@ -325,7 +325,8 @@ FILES_libvulkan-imx = "${libdir}/libvulkan_VSI${REALSOLIBS} ${libdir}/libSPIRV_v
 FILES_libvulkan-imx-dev = "${includedir}/vulkan ${libdir}/libvulkan_VSI${SOLIBSDEV}"
 
 FILES_libopenvx-imx = " \
-        ${libdir}/libOpenVX*${SOLIBS} \
+        ${libdir}/libOpenVX*${REALSOLIBS} \
+        ${libdir}/libOpenVXU${SOLIBS} \
         ${libdir}/libOvx*${SOLIBS} \
         ${libdir}/libovx*${SOLIBS} \
         "
@@ -356,7 +357,7 @@ RDEPENDS_libgles2-imx-dev += "libgles3-imx-dev"
 FILES_libglslc-imx = "${libdir}/libGLSLC${SOLIBS}"
 FILES_libglslc-imx-dev = "${includedir}/CL ${libdir}/libGLSLC${SOLIBSDEV}"
 
-FILES_libopencl-imx = "${libdir}/libOpenCL${SOLIBS} \
+FILES_libopencl-imx = "${libdir}/libOpenCL${REALSOLIBS} \
                        ${libdir}/libVivanteOpenCL${SOLIBS} \
                        ${libdir}/libLLVM_viv${SOLIBS} \
                        ${sysconfdir}/OpenCL/vendors/Vivante.icd"