From 7699aeb3d37576ea3fdfb0eb9f2333386f9415a6 Mon Sep 17 00:00:00 2001 From: James Edwards Date: Mon, 17 Apr 2017 23:58:34 -0500 Subject: [PATCH 1/3] Fix RPM HIP packages from specifying /opt Change-Id: Iec3c3b81eef4c8888d425eefc80b12488a8d20a1 --- packaging/hip_base.txt | 1 + packaging/hip_doc.txt | 1 + packaging/hip_hcc.txt | 1 + packaging/hip_nvcc.txt | 1 + packaging/hip_samples.txt | 1 + 5 files changed, 5 insertions(+) diff --git a/packaging/hip_base.txt b/packaging/hip_base.txt index a208bc3463..836a82657b 100644 --- a/packaging/hip_base.txt +++ b/packaging/hip_base.txt @@ -33,5 +33,6 @@ set(CPACK_RPM_POST_INSTALL_SCRIPT_FILE "${PROJECT_BINARY_DIR}/postinst") set(CPACK_RPM_PRE_UNINSTALL_SCRIPT_FILE "${PROJECT_BINARY_DIR}/prerm") set(CPACK_RPM_PACKAGE_AUTOREQPROV " no") set(CPACK_RPM_PACKAGE_REQUIRES "perl >= 5.0") +set(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "/opt") set(CPACK_SOURCE_GENERATOR "TGZ") include(CPack) diff --git a/packaging/hip_doc.txt b/packaging/hip_doc.txt index d5a0c471b1..6f602c84cf 100644 --- a/packaging/hip_doc.txt +++ b/packaging/hip_doc.txt @@ -36,5 +36,6 @@ set(CPACK_BINARY_RPM "ON") set(CPACK_RPM_PACKAGE_ARCHITECTURE "x86_64") set(CPACK_RPM_PACKAGE_AUTOREQPROV " no") set(CPACK_RPM_PACKAGE_REQUIRES "hip_base = ${CPACK_PACKAGE_VERSION}") +set(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "/opt") set(CPACK_SOURCE_GENERATOR "TGZ") include(CPack) diff --git a/packaging/hip_hcc.txt b/packaging/hip_hcc.txt index 7118c32eb9..b0808aa0bc 100644 --- a/packaging/hip_hcc.txt +++ b/packaging/hip_hcc.txt @@ -46,5 +46,6 @@ if(@COMPILE_HIP_ATP_MARKER@) else() set(CPACK_RPM_PACKAGE_REQUIRES "hip_base = ${CPACK_PACKAGE_VERSION}, ${HCC_PACKAGE_NAME} = @HCC_PACKAGE_VERSION@") endif() +set(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "/opt") set(CPACK_SOURCE_GENERATOR "TGZ") include(CPack) diff --git a/packaging/hip_nvcc.txt b/packaging/hip_nvcc.txt index ea4943f282..0d7c357623 100644 --- a/packaging/hip_nvcc.txt +++ b/packaging/hip_nvcc.txt @@ -25,5 +25,6 @@ set(CPACK_RPM_PACKAGE_ARCHITECTURE "x86_64") #set(CPACK_RPM_PRE_UNINSTALL_SCRIPT_FILE "${PROJECT_BINARY_DIR}/prerm") set(CPACK_RPM_PACKAGE_AUTOREQPROV " no") set(CPACK_RPM_PACKAGE_REQUIRES "hip_base = ${CPACK_PACKAGE_VERSION}, cuda >= 7.5") +set(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "/opt") set(CPACK_SOURCE_GENERATOR "TGZ") include(CPack) diff --git a/packaging/hip_samples.txt b/packaging/hip_samples.txt index f289f2a8e5..6d34a6fd40 100644 --- a/packaging/hip_samples.txt +++ b/packaging/hip_samples.txt @@ -24,5 +24,6 @@ set(CPACK_BINARY_RPM "ON") set(CPACK_RPM_PACKAGE_ARCHITECTURE "x86_64") set(CPACK_RPM_PACKAGE_AUTOREQPROV " no") set(CPACK_RPM_PACKAGE_REQUIRES "hip_base = ${CPACK_PACKAGE_VERSION}") +set(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "/opt") set(CPACK_SOURCE_GENERATOR "TGZ") include(CPack) From 36353a560f214fbcde9b762141112bc2a8fac6eb Mon Sep 17 00:00:00 2001 From: James Edwards Date: Fri, 21 Apr 2017 22:34:26 -0500 Subject: [PATCH 2/3] Properly link hip cmake file into top level lib directory. Change-Id: I2113a86ca6985f34fd0cfb091abdbce0f632cfc2 --- packaging/hip_hcc.postinst | 15 ++++++++++----- packaging/hip_hcc.prerm | 10 +++++++--- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/packaging/hip_hcc.postinst b/packaging/hip_hcc.postinst index 14179db767..e7d53b742b 100755 --- a/packaging/hip_hcc.postinst +++ b/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/packaging/hip_hcc.prerm b/packaging/hip_hcc.prerm index dda313a3a4..ee64aea632 100755 --- a/packaging/hip_hcc.prerm +++ b/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 From 4869bf5a7cd02ad0bce8057eebbbe098ac30963b Mon Sep 17 00:00:00 2001 From: James Edwards Date: Sat, 22 Apr 2017 15:54:14 -0500 Subject: [PATCH 3/3] Specify full path of hip libraries in link file. Change-Id: I49b788f3489e7abff6b11006ff97fdfca4e5942c --- packaging/hip_hcc.postinst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/hip_hcc.postinst b/packaging/hip_hcc.postinst index e7d53b742b..c7f9c3184c 100755 --- a/packaging/hip_hcc.postinst +++ b/packaging/hip_hcc.postinst @@ -19,7 +19,7 @@ mkdir -p $ROCMLIBDIR/cmake pushd $ROCMLIBDIR for f in $HIPLIBFILES do - ln -s $f $(basename $f) + ln -s $HIPLIBDIR/$f $(basename $f) done # Make the hip cmake directory link. pushd cmake