Merge 'master' into 'amd-master'

Change-Id: I082d987c30677ca9dc117f6825811584c7c6d262


[ROCm/clr commit: 6bc51b582f]

projects/clr/hipamd/packaging/hip_base.postinst

@@ -17,9 +17,9 @@ mkdir -p $ROCMBINDIR
 pushd $ROCMBINDIR
 for f in $HIPBINFILES
 do
-    ln -s $f $(basename $f)
+    ln -s -f $f $(basename $f)
 done
-    ln -s $HIPDIR/bin/.hipVersion .hipVersion
+    ln -s -f $HIPDIR/bin/.hipVersion .hipVersion
 popd
 
 # Soft-link to headers
@@ -27,5 +27,5 @@ HIPINCDIR=$HIPDIR/include/hip
 ROCMINCDIR=$ROCMDIR/include
 mkdir -p $ROCMINCDIR
 pushd $ROCMINCDIR
-    ln -s $HIPINCDIR hip
+    ln -s -f $HIPINCDIR hip
 popd

projects/clr/hipamd/packaging/hip_hcc.postinst

@@ -19,11 +19,11 @@ mkdir -p $ROCMLIBDIR/cmake
 pushd $ROCMLIBDIR
 for f in $HIPLIBFILES
 do
-    ln -s $HIPLIBDIR/$f $(basename $f)
+    ln -s -f $HIPLIBDIR/$f $(basename $f)
 done
 # Make the hip cmake directory link.
 pushd cmake
-ln -s $HIPLIBDIR/cmake/hip hip
+ln -s -f $HIPLIBDIR/cmake/hip hip
 popd
 popd