From feab085103abae138cc2d267cfc11c851291b44f Mon Sep 17 00:00:00 2001
From: Anusha GodavarthySurya <Anusha.GodavarthySurya@amd.com>
Date: Thu, 18 Mar 2021 09:15:51 -0700
Subject: [PATCH] SWDEV-272025 - Replace pushd/popd with cd

Change-Id: I0464e4079e31ddbc4e2032d64600f1f2c31a2c1f


[ROCm/hip commit: bb4433be51057bb926ba25d4b12b2e556078405e]
---
 projects/hip/packaging/hip-base.postinst   | 21 +++++++--------------
 projects/hip/packaging/hip-base.prerm      | 22 +++++++++-------------
 projects/hip/packaging/hip-rocclr.postinst | 19 +++++--------------
 projects/hip/packaging/hip-rocclr.prerm    | 21 ++++++++-------------
 4 files changed, 29 insertions(+), 54 deletions(-)

diff --git a/projects/hip/packaging/hip-base.postinst b/projects/hip/packaging/hip-base.postinst
index 282b900ca7..ebc04c05b8 100755
--- a/projects/hip/packaging/hip-base.postinst
+++ b/projects/hip/packaging/hip-base.postinst
@@ -18,14 +18,6 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
-
-pushd () {
-    command pushd "$@" > /dev/null
-}
-
-popd () {
-    command popd "$@" > /dev/null
-}
 ROCMDIR=@ROCM_PATH@
 HIPDIR=$ROCMDIR/hip
 
@@ -33,23 +25,24 @@ HIPDIR=$ROCMDIR/hip
 HIPBINFILES=$HIPDIR/bin/*
 ROCMBINDIR=$ROCMDIR/bin
 mkdir -p $ROCMBINDIR
-pushd $ROCMBINDIR
+CURRENTDIR=`pwd`
+cd $ROCMBINDIR
 for f in $HIPBINFILES
 do
     ln -r -s -f $f $(basename $f)
 done
     ln -r -s -f $HIPDIR/bin/.hipVersion .hipVersion
-popd
+cd $CURRENTDIR
 
 # Soft-link to headers
 HIPINCDIR=$HIPDIR/include/hip
 ROCMINCDIR=$ROCMDIR/include
 mkdir -p $ROCMINCDIR
-pushd $ROCMINCDIR
+cd $ROCMINCDIR
     ln -r -s -f $HIPINCDIR hip
-popd
+cd $CURRENTDIR
 
 # The following will be removed after upstream updation
-pushd $HIPINCDIR
+cd $HIPINCDIR
     ln -r -s -f amd_detail hcc_detail
-popd
\ No newline at end of file
+cd $CURRENTDIR
\ No newline at end of file
diff --git a/projects/hip/packaging/hip-base.prerm b/projects/hip/packaging/hip-base.prerm
index a64a412135..895645f21a 100755
--- a/projects/hip/packaging/hip-base.prerm
+++ b/projects/hip/packaging/hip-base.prerm
@@ -18,15 +18,6 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
-
-pushd () {
-    command pushd "$@" > /dev/null
-}
-
-popd () {
-    command popd "$@" > /dev/null
-}
-
 ROCMDIR=@ROCM_PATH@
 HIPDIR=$ROCMDIR/hip
 ([ ! -d $ROCMDIR ] || [ ! -d $HIPDIR ]) && exit 0
@@ -36,21 +27,26 @@ HIPBINDIR=$HIPDIR/bin
 ROCMBINDIR=$ROCMDIR/bin
 ([ ! -d $ROCMBINDIR ] || [ ! -d $HIPBINDIR ]) && exit 0
 HIPBINFILES=$HIPBINDIR/*
-pushd $ROCMBINDIR
+CURRENTDIR=`pwd`
+cd $ROCMBINDIR
 for f in $HIPBINFILES; do
     [ -e $f ] || continue
     rm $(basename $f)
 done
 rm .hipVersion
-popd
+cd $CURRENTDIR
 rmdir --ignore-fail-on-non-empty $ROCMBINDIR
 
 # Remove soft-link to headers
 HIPINCDIR=$HIPDIR/include
+cd $HIPINCDIR/hip
+rm hcc_detail
+cd $CURRENTDIR
+
 ROCMINCDIR=$ROCMDIR/include
 ([ ! -d $ROCMINCDIR ] || [ ! -d $HIPINCDIR ]) && exit 0
-pushd $ROCMINCDIR
+cd $ROCMINCDIR
 rm hip
-popd
+cd $CURRENTDIR
 rmdir --ignore-fail-on-non-empty $ROCMINCDIR
 
diff --git a/projects/hip/packaging/hip-rocclr.postinst b/projects/hip/packaging/hip-rocclr.postinst
index d678654807..6d197a5ba4 100755
--- a/projects/hip/packaging/hip-rocclr.postinst
+++ b/projects/hip/packaging/hip-rocclr.postinst
@@ -19,29 +19,21 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-pushd () {
-    command pushd "$@" > /dev/null
-}
-
-popd () {
-    command popd "$@" > /dev/null
-}
-
 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
-pushd $ROCMLIBDIR
 
+cd $ROCMLIBDIR
 for f in $ROCCLRLIBFILES
 do
     ln -s -r -f $ROCCLRLIBDIR/$f $(basename $f)
@@ -51,12 +43,11 @@ for f in $HIPLIBFILES
 do
     ln -s -r -f $HIPLIBDIR/$f $(basename $f)
 done
+cd $CURRENTDIR
 
 # Make the hip cmake directory link.
-pushd cmake
+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
-
-popd
-popd
+cd $CURRENTDIR
diff --git a/projects/hip/packaging/hip-rocclr.prerm b/projects/hip/packaging/hip-rocclr.prerm
index 2d6fb01831..3521c7ac5c 100755
--- a/projects/hip/packaging/hip-rocclr.prerm
+++ b/projects/hip/packaging/hip-rocclr.prerm
@@ -19,14 +19,6 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-pushd () {
-    command pushd "$@" > /dev/null
-}
-
-popd () {
-    command popd "$@" > /dev/null
-}
-
 ROCMDIR=@ROCM_PATH@
 ROCMLIBDIR=$ROCMDIR/lib
 ROCCLRDIR=$ROCMDIR/rocclr
@@ -35,12 +27,12 @@ HIPDIR=$ROCMDIR/hip
 HIPLIBDIR=$ROCMDIR/hip/lib
 ([ ! -d $ROCMDIR ] || [ ! -d $ROCCLRDIR ] || [ ! -d $HIPDIR ]) && exit 0
 ([ ! -d $ROCMLIBDIR ] || [ ! -d $ROCCLRLIBDIR ] || [ ! -d $HIPLIBDIR ]) && exit 0
-
+CURRENTDIR=`pwd`
 # Remove soft-links to libraries
 ROCCLRLIBFILES=$(ls -A $ROCCLRLIBDIR | grep -v [-/$])
 HIPLIBFILES=$(ls -A $HIPLIBDIR | grep -v [-/$])
 
-pushd $ROCMLIBDIR
+cd  $ROCMLIBDIR
 for f in $ROCCLRLIBFILES; do
     [ -e $f ] || continue
     rm $(basename $f)
@@ -50,13 +42,16 @@ for f in $HIPLIBFILES; do
     [ -e $f ] || continue
     rm $(basename $f)
 done
+cd $CURRENTDIR
 
-pushd cmake
+cd $ROCMLIBDIR/cmake
 unlink rocclr
 unlink hip
 unlink hip-lang
-popd
+cd $CURRENTDIR
+
+cd $ROCMLIBDIR
 rmdir --ignore-fail-on-non-empty cmake
-popd
+cd $CURRENTDIR
 rmdir --ignore-fail-on-non-empty $ROCMLIBDIR