From 84706b51f99488d29a456da9c828cac17f9aaa07 Mon Sep 17 00:00:00 2001 From: Anusha GodavarthySurya Date: Fri, 9 Jul 2021 05:09:36 -0700 Subject: [PATCH] SWDEV-294497 - remove rocclr from packaging Change-Id: Ic9825114ece0c84b6490c44a441a5f8af0e772fc [ROCm/clr commit: 8ad7c705f7c9b720b7da05163e25c8c88a62801b] --- projects/clr/hipamd/packaging/hip-rocclr.postinst | 9 --------- projects/clr/hipamd/packaging/hip-rocclr.prerm | 14 ++------------ 2 files changed, 2 insertions(+), 21 deletions(-) diff --git a/projects/clr/hipamd/packaging/hip-rocclr.postinst b/projects/clr/hipamd/packaging/hip-rocclr.postinst index a92ee6a789..a40954d989 100755 --- a/projects/clr/hipamd/packaging/hip-rocclr.postinst +++ b/projects/clr/hipamd/packaging/hip-rocclr.postinst @@ -21,24 +21,16 @@ ROCMDIR=@ROCM_PATH@ ROCMLIBDIR=$ROCMDIR/lib -ROCCLRDIR=$ROCMDIR/rocclr -ROCCLRLIBDIR=$ROCMDIR/rocclr/lib HIPDIR=$ROCMDIR/hip HIPLIBDIR=$ROCMDIR/hip/lib CURRENTDIR=`pwd` # Soft-link to library files -ROCCLRLIBFILES=$(ls -A $ROCCLRLIBDIR | grep -v "cmake\|[-/$]") HIPLIBFILES=$(ls -A $HIPLIBDIR | grep -v "cmake\|[-/$]") mkdir -p $ROCMLIBDIR mkdir -p $ROCMLIBDIR/cmake cd $ROCMLIBDIR -for f in $ROCCLRLIBFILES -do - ln -s -r -f $ROCCLRLIBDIR/$f $(basename $f) -done - for f in $HIPLIBFILES do ln -s -r -f $HIPLIBDIR/$f $(basename $f) @@ -47,7 +39,6 @@ cd $CURRENTDIR # Make the hip cmake directory link. cd $ROCMLIBDIR/cmake -ln -s -r -f $ROCCLRLIBDIR/cmake/rocclr rocclr ln -s -r -f $HIPLIBDIR/cmake/hip hip ln -s -r -f $HIPLIBDIR/cmake/hip-lang hip-lang cd $CURRENTDIR diff --git a/projects/clr/hipamd/packaging/hip-rocclr.prerm b/projects/clr/hipamd/packaging/hip-rocclr.prerm index 1c94e6bc17..69b7758a6c 100755 --- a/projects/clr/hipamd/packaging/hip-rocclr.prerm +++ b/projects/clr/hipamd/packaging/hip-rocclr.prerm @@ -21,23 +21,15 @@ ROCMDIR=@ROCM_PATH@ ROCMLIBDIR=$ROCMDIR/lib -ROCCLRDIR=$ROCMDIR/rocclr -ROCCLRLIBDIR=$ROCMDIR/rocclr/lib HIPDIR=$ROCMDIR/hip HIPLIBDIR=$ROCMDIR/hip/lib -([ ! -d $ROCMDIR ] || [ ! -d $ROCCLRDIR ] || [ ! -d $HIPDIR ]) && exit 0 -([ ! -d $ROCMLIBDIR ] || [ ! -d $ROCCLRLIBDIR ] || [ ! -d $HIPLIBDIR ]) && exit 0 +([ ! -d $ROCMDIR ] || [ ! -d $HIPDIR ]) && exit 0 +([ ! -d $ROCMLIBDIR ] || [ ! -d $HIPLIBDIR ]) && exit 0 CURRENTDIR=`pwd` # Remove soft-links to libraries -ROCCLRLIBFILES=$(ls -A $ROCCLRLIBDIR | grep -v [-/$]) HIPLIBFILES=$(ls -A $HIPLIBDIR | grep -v [-/$]) cd $ROCMLIBDIR -for f in $ROCCLRLIBFILES; do - [ -e $f ] || continue - rm $(basename $f) -done - for f in $HIPLIBFILES; do [ -e $f ] || continue rm $(basename $f) @@ -45,7 +37,6 @@ done cd $CURRENTDIR cd $ROCMLIBDIR/cmake -unlink rocclr unlink hip unlink hip-lang cd $CURRENTDIR @@ -54,4 +45,3 @@ cd $ROCMLIBDIR rmdir --ignore-fail-on-non-empty cmake cd $CURRENTDIR rmdir --ignore-fail-on-non-empty $ROCMLIBDIR -