opencl-on-vdi:Add symlink for libopencl lib to ROCm lib

Move libOpenCL.so from rocm-opencl-dev package to rocm-opencl.
Having the libOpenCL.so alone and that too just a symlink pointing
to a file in another package is not the right way.

Adding a symlink for libOpenCL... to rocm/lib will make package
deployment easier.

Change-Id: Icc98d2280253c8a485ef906e97fc75129ad6d064

opencl/CMakeLists.txt

@@ -79,6 +79,12 @@ install(PROGRAMS $<TARGET_LINKER_FILE:OpenCL>
 #############################
 set(CPACK_PACKAGING_INSTALL_PREFIX "/opt/rocm/opencl" CACHE PATH "Package Installation path for OpenCL")
 
+#ROCM_PATH is needed to create symlink of libraries
+if (NOT DEFINED ROCM_PATH )
+     string(REPLACE "/opencl" "" ROCM_PATH ${CPACK_PACKAGING_INSTALL_PREFIX})
+endif ()
+message (STATUS "ROCM Installation path(ROCM_PATH): ${ROCM_PATH}")
+
 # Package: rocm-opencl
 set(BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR}/packages/rocm-opencl)
 configure_file(packaging/rocm-opencl.txt ${BUILD_DIR}/CMakeLists.txt @ONLY)

opencl/packaging/rocm-opencl-dev.txt

@@ -8,7 +8,6 @@ install(DIRECTORY @opencl_SOURCE_DIR@/khronos/headers/opencl2.2/CL
         PATTERN cl_d3d11.h EXCLUDE
         PATTERN cl_dx9_media_sharing.h EXCLUDE
         PATTERN cl_egl.h EXCLUDE)
-install(FILES @PROJECT_BINARY_DIR@/khronos/icd/libOpenCL.so DESTINATION lib)
 
 #############################
 # Packaging steps

opencl/packaging/rocm-opencl.postinst

@@ -9,11 +9,18 @@ do_ldconfig() {
   mkdir -p /etc/OpenCL/vendors && (echo libamdocl64.so > /etc/OpenCL/vendors/amdocl64.icd)
 }
 
+INSTALL_PATH=@CPACK_PACKAGING_INSTALL_PREFIX@
+ROCM_LIBPATH=@ROCM_PATH@/lib
+
 case "$1" in
   abort-deconfigure|abort-remove|abort-upgrade)
     echo "$1"
   ;;
   configure)
+    mkdir -p ${ROCM_LIBPATH}
+    ln -s -f -r ${INSTALL_PATH}/lib/libOpenCL.so ${ROCM_LIBPATH}/libOpenCL.so
+    ln -s -f -r ${INSTALL_PATH}/lib/libOpenCL.so.@OPENCL_LIB_VERSION_MAJOR@ ${ROCM_LIBPATH}/libOpenCL.so.@OPENCL_LIB_VERSION_MAJOR@
+    ln -s -f -r ${INSTALL_PATH}/lib/libOpenCL.so.@OPENCL_LIB_VERSION_STRING@ ${ROCM_LIBPATH}/libOpenCL.so.@OPENCL_LIB_VERSION_STRING@
     do_ldconfig
   ;;
   *)

opencl/packaging/rocm-opencl.prerm

@@ -11,6 +11,11 @@ case "$1" in
   purge)
   ;;
   remove)
+    rm -f @ROCM_PATH@/lib/libOpenCL.so
+    rm -f @ROCM_PATH@/lib/libOpenCL.so.@OPENCL_LIB_VERSION_MAJOR@
+    rm -f @ROCM_PATH@/lib/libOpenCL.so.@OPENCL_LIB_VERSION_STRING@
+    rmdir --ignore-fail-on-non-empty @ROCM_PATH@/lib
+    rmdir --ignore-fail-on-non-empty @ROCM_PATH@
     rm_ldconfig
   ;;
   *)

opencl/packaging/rocm-opencl.rpm_post

@@ -2,3 +2,10 @@ if [ -e "/opt/rocm/opencl" ] ; then
   echo /opt/rocm/opencl/lib > /etc/ld.so.conf.d/x86_64-rocm-opencl.conf && ldconfig
 fi
 mkdir -p /etc/OpenCL/vendors && (echo libamdocl64.so > /etc/OpenCL/vendors/amdocl64.icd)
+INSTALL_PATH=@CPACK_PACKAGING_INSTALL_PREFIX@
+ROCM_LIBPATH=@ROCM_PATH@/lib
+
+mkdir -p ${ROCM_LIBPATH}
+ln -s -f -r ${INSTALL_PATH}/lib/libOpenCL.so ${ROCM_LIBPATH}/libOpenCL.so
+ln -s -f -r ${INSTALL_PATH}/lib/libOpenCL.so.@OPENCL_LIB_VERSION_MAJOR@ ${ROCM_LIBPATH}/libOpenCL.so.@OPENCL_LIB_VERSION_MAJOR@
+ln -s -f -r ${INSTALL_PATH}/lib/libOpenCL.so.@OPENCL_LIB_VERSION_STRING@ ${ROCM_LIBPATH}/libOpenCL.so.@OPENCL_LIB_VERSION_STRING@

opencl/packaging/rocm-opencl.rpm_postun

@@ -1,4 +1,11 @@
 if [ $1 -eq 0 ]; then
   rm -f /etc/ld.so.conf.d/x86_64-rocm-opencl.conf && ldconfig
   rm -f /etc/OpenCL/vendors/amdocl64.icd
+  rm -f @ROCM_PATH@/lib/libOpenCL.so
+  rm -f @ROCM_PATH@/lib/libOpenCL.so.@OPENCL_LIB_VERSION_MAJOR@
+  rm -f @ROCM_PATH@/lib/libOpenCL.so.@OPENCL_LIB_VERSION_STRING@
+  rmdir --ignore-fail-on-non-empty @ROCM_PATH@/lib
+  rmdir --ignore-fail-on-non-empty @ROCM_PATH@
 fi
+
+

opencl/packaging/rocm-opencl.txt

@@ -3,6 +3,7 @@ project(rocm-opencl)
 
 install(DIRECTORY @PROJECT_BINARY_DIR@/bin DESTINATION . USE_SOURCE_PERMISSIONS)
 install(FILES @PROJECT_BINARY_DIR@/lib/libamdocl64.so DESTINATION lib)
+install(FILES @PROJECT_BINARY_DIR@/khronos/icd/libOpenCL.so DESTINATION lib)
 install(FILES @PROJECT_BINARY_DIR@/khronos/icd/libOpenCL.so.@OPENCL_LIB_VERSION_MAJOR@ DESTINATION lib)
 install(FILES @PROJECT_BINARY_DIR@/khronos/icd/libOpenCL.so.@OPENCL_LIB_VERSION_STRING@ DESTINATION lib)