From 00859b2b693e431d6d093a1c6173d63211b72329 Mon Sep 17 00:00:00 2001 From: Naveen Saini Date: Fri, 22 Apr 2022 14:42:39 +0800 Subject: intel-oneapi-compiler: use ocl-icd instead of opencl-icd-loader Both ocl-icd and opencl-icd-loader provides OpenCL library. Currently openvino uses ocl-icd, which causes conflict with opencl-icd-loader while packaging. So using ocl-icd instead. Error: file /usr/lib/libOpenCL.so.1 conflicts between attempted installs of opencl-icd-loader-v2022.01.04+git0+169f05d026-r0.skylake_64 and libopencl1-2.3.1-r0.skylake_64 Signed-off-by: Naveen Saini Signed-off-by: Anuj Mittal --- .../recipes-oneapi/compiler/intel-oneapi-compiler_2022.0.1-3633.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dynamic-layers/openembedded-layer/recipes-oneapi/compiler/intel-oneapi-compiler_2022.0.1-3633.bb b/dynamic-layers/openembedded-layer/recipes-oneapi/compiler/intel-oneapi-compiler_2022.0.1-3633.bb index 7c399d71..b9d4fdf6 100644 --- a/dynamic-layers/openembedded-layer/recipes-oneapi/compiler/intel-oneapi-compiler_2022.0.1-3633.bb +++ b/dynamic-layers/openembedded-layer/recipes-oneapi/compiler/intel-oneapi-compiler_2022.0.1-3633.bb @@ -49,7 +49,7 @@ ALTERNATIVE_PRIORITY[Intel_FPGA_SSG_Emulator.icd] = "328736233" INHIBIT_PACKAGE_STRIP = "1" INHIBIT_PACKAGE_DEBUG_SPLIT = "1" -RDEPENDS:${PN} += "perl elfutils opencl-icd-loader level-zero-loader zlib tbb libelf setup-intel-oneapi-env" +RDEPENDS:${PN} += "perl elfutils ocl-icd level-zero-loader zlib tbb libelf setup-intel-oneapi-env" INSANE_SKIP:${PN} += "textrel dev-so" # The libomptarget.rtl.x86_64.so library is not supported on Yocto 3.1+ due to using obsolete libffi.so.6 -- cgit v1.2.3-54-g00ecf