From c33c84a596ef8e76cd996ca1ca64db6106902ec7 Mon Sep 17 00:00:00 2001
From: James Edwards <JamesAdrian.Edwards@amd.com>
Date: Fri, 21 Apr 2017 22:34:26 -0500
Subject: [PATCH] Properly link hip cmake file into top level lib directory.

Change-Id: I2113a86ca6985f34fd0cfb091abdbce0f632cfc2
---
 hipamd/packaging/hip_hcc.postinst | 15 ++++++++++-----
 hipamd/packaging/hip_hcc.prerm    | 10 +++++++---
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/hipamd/packaging/hip_hcc.postinst b/hipamd/packaging/hip_hcc.postinst
index 14179db767..e7d53b742b 100755
--- a/hipamd/packaging/hip_hcc.postinst
+++ b/hipamd/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)
 done
-    ln -s $HIPDIR/lib/.hipInfo .hipInfo
+# Make the hip cmake directory link.
+pushd cmake
+ln -s $HIPLIBDIR/cmake/hip hip
+popd
 popd
 
diff --git a/hipamd/packaging/hip_hcc.prerm b/hipamd/packaging/hip_hcc.prerm
index dda313a3a4..ee64aea632 100755
--- a/hipamd/packaging/hip_hcc.prerm
+++ b/hipamd/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