Merge branch 'amd-master' into amd-develop

packaging/hip_hcc.postinst

@@ -8,17 +8,22 @@ popd () {
 }
 
 ROCMDIR=/opt/rocm
-HIPDIR=$ROCMDIR/hip
-
-# Soft-link to libraries
-HIPLIBFILES=$HIPDIR/lib/*
 ROCMLIBDIR=$ROCMDIR/lib
+HIPDIR=$ROCMDIR/hip
+HIPLIBDIR=$ROCMDIR/hip/lib
+
+# Soft-link to library files
+HIPLIBFILES=$(ls -aF $HIPLIBDIR | grep -v [-/$])
 mkdir -p $ROCMLIBDIR
+mkdir -p $ROCMLIBDIR/cmake
 pushd $ROCMLIBDIR
 for f in $HIPLIBFILES
 do
-    ln -s $f $(basename $f)
+    ln -s $HIPLIBDIR/$f $(basename $f)
 done
-    ln -s $HIPDIR/lib/.hipInfo .hipInfo
+# Make the hip cmake directory link.
+pushd cmake
+ln -s $HIPLIBDIR/cmake/hip hip
+popd
 popd
 

packaging/hip_hcc.prerm

@@ -9,17 +9,21 @@ popd () {
 }
 
 ROCMDIR=/opt/rocm
+ROCMLIBDIR=$ROCMDIR/lib
 HIPDIR=$ROCMDIR/hip
+HIPLIBDIR=$ROCMDIR/hip/lib
 
 # Remove soft-links to libraries
-HIPLIBFILES=$HIPDIR/lib/*
-ROCMLIBDIR=$ROCMDIR/lib
+HIPLIBFILES=$(ls -aF $HIPLIBDIR | grep -v [-/$])
 pushd $ROCMLIBDIR
 for f in $HIPLIBFILES
 do
 rm $(basename $f)
 done
-rm .hipInfo
+pushd cmake
+unlink hip
+popd
+rmdir --ignore-fail-on-non-empty cmake
 popd
 rmdir --ignore-fail-on-non-empty $ROCMLIBDIR