From f98233ab6a4ee6c21c2c404f97c7aebe3d0bf4b3 Mon Sep 17 00:00:00 2001
From: Maneesh Gupta <maneesh.gupta@amd.com>
Date: Wed, 29 Sep 2021 03:25:45 -0700
Subject: [PATCH] SWDEV-305219 - SWDEV-305226 - Fix debian package name to
 hip-dev

Change-Id: Ic19b0edde812747ff7fd8daacd16b4dabe937ed7


[ROCm/clr commit: c4287c6650fa0d3a3e9bba3b084f1f27a568c3b9]
---
 projects/clr/hipamd/install.sh                | 2 +-
 projects/clr/hipamd/packaging/hip-devel.txt   | 7 ++++---
 projects/clr/hipamd/packaging/hip-doc.txt     | 2 +-
 projects/clr/hipamd/packaging/hip-samples.txt | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/projects/clr/hipamd/install.sh b/projects/clr/hipamd/install.sh
index 16966ac8c6..2e608e78d8 100755
--- a/projects/clr/hipamd/install.sh
+++ b/projects/clr/hipamd/install.sh
@@ -115,7 +115,7 @@ function buildHIP()
     if [ "$OS_NAME" == "Ubuntu" ]
     then
       cp hip-*.deb $WORKING_DIR
-      sudo dpkg -i -B hip-devel*.deb hip-runtime-amd*.deb hip-sample*.deb hip-doc*.deb
+      sudo dpkg -i -B hip-dev*.deb hip-runtime-amd*.deb hip-sample*.deb hip-doc*.deb
     elif [ "$OS_NAME" == "CentOS" ]
     then
       cp hip-*.rpm $WORKING_DIR
diff --git a/projects/clr/hipamd/packaging/hip-devel.txt b/projects/clr/hipamd/packaging/hip-devel.txt
index ab001aa017..85cd60957a 100644
--- a/projects/clr/hipamd/packaging/hip-devel.txt
+++ b/projects/clr/hipamd/packaging/hip-devel.txt
@@ -18,8 +18,8 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-cmake_minimum_required(VERSION 2.8.3)
-project(hip_devel)
+cmake_minimum_required(VERSION 3.16.8)
+project(hip_dev)
 
 if(WIN32)
   install(DIRECTORY @HIP_COMMON_DIR@/bin DESTINATION . USE_SOURCE_PERMISSIONS)
@@ -43,7 +43,7 @@ install(DIRECTORY @HIP_COMMON_DIR@/cmake DESTINATION .)
 #############################
 set(CPACK_SET_DESTDIR TRUE)
 set(CPACK_INSTALL_PREFIX @CPACK_INSTALL_PREFIX@ )
-set(CPACK_PACKAGE_NAME "hip-devel")
+set(CPACK_PACKAGE_NAME "hip-dev")
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "HIP Heterogenous-computing Interface for Portability [DEVELOPMENT]")
 set(CPACK_PACKAGE_DESCRIPTION "HIP:
       Heterogenous-computing Interface for Portability [DEVELOPMENT]")
@@ -65,6 +65,7 @@ set(CPACK_DEBIAN_PACKAGE_REPLACES "hip-base")
 
 set(CPACK_BINARY_RPM "ON")
 set(CPACK_RPM_PACKAGE_RELEASE @CPACK_RPM_PACKAGE_RELEASE@)
+set(CPACK_RPM_PACKAGE_NAME "hip-devel")
 set(CPACK_RPM_FILE_NAME "RPM-DEFAULT")
 set(CPACK_RPM_PACKAGE_ARCHITECTURE "${CMAKE_SYSTEM_PROCESSOR}")
 set(CPACK_RPM_POST_INSTALL_SCRIPT_FILE "${PROJECT_BINARY_DIR}/postinst")
diff --git a/projects/clr/hipamd/packaging/hip-doc.txt b/projects/clr/hipamd/packaging/hip-doc.txt
index b4027cee9a..3b1af26927 100644
--- a/projects/clr/hipamd/packaging/hip-doc.txt
+++ b/projects/clr/hipamd/packaging/hip-doc.txt
@@ -55,7 +55,7 @@ set(CPACK_GENERATOR "TGZ;DEB;RPM")
 set(CPACK_BINARY_DEB "ON")
 set(CPACK_DEBIAN_PACKAGE_RELEASE @CPACK_DEBIAN_PACKAGE_RELEASE@)
 set(CPACK_DEBIAN_FILE_NAME "DEB-DEFAULT")
-set(CPACK_DEBIAN_PACKAGE_DEPENDS "hip-devel (= ${CPACK_PACKAGE_VERSION}-${CPACK_DEBIAN_PACKAGE_RELEASE}), rocm-core")
+set(CPACK_DEBIAN_PACKAGE_DEPENDS "hip-dev (= ${CPACK_PACKAGE_VERSION}-${CPACK_DEBIAN_PACKAGE_RELEASE}), rocm-core")
 set(CPACK_DEBIAN_PACKAGE_PROVIDES "hip-doc")
 
 set(CPACK_BINARY_RPM "ON")
diff --git a/projects/clr/hipamd/packaging/hip-samples.txt b/projects/clr/hipamd/packaging/hip-samples.txt
index 037bcff612..c38a56cfb2 100644
--- a/projects/clr/hipamd/packaging/hip-samples.txt
+++ b/projects/clr/hipamd/packaging/hip-samples.txt
@@ -43,7 +43,7 @@ set(CPACK_GENERATOR "TGZ;DEB;RPM")
 set(CPACK_BINARY_DEB "ON")
 set(CPACK_DEBIAN_PACKAGE_RELEASE @CPACK_DEBIAN_PACKAGE_RELEASE@)
 set(CPACK_DEBIAN_FILE_NAME "DEB-DEFAULT")
-set(CPACK_DEBIAN_PACKAGE_DEPENDS "hip-devel (= ${CPACK_PACKAGE_VERSION}-${CPACK_DEBIAN_PACKAGE_RELEASE}), rocm-core")
+set(CPACK_DEBIAN_PACKAGE_DEPENDS "hip-dev (= ${CPACK_PACKAGE_VERSION}-${CPACK_DEBIAN_PACKAGE_RELEASE}), rocm-core")
 set(CPACK_DEBIAN_PACKAGE_PROVIDES "hip-samples")
 
 set(CPACK_BINARY_RPM "ON")