From 2480727f5c4f3c3ce0b388564884458e42b3f987 Mon Sep 17 00:00:00 2001
From: Maneesh Gupta <maneesh.gupta@amd.com>
Date: Thu, 17 Jun 2021 05:41:12 -0700
Subject: [PATCH] SWDEV-291578 - SWDEV-291581 - Fix packaging scripts

Change-Id: I0b3e2134aea631bcc0b5f24d382733b04f7d1a77


[ROCm/hip commit: 238595de9cd6e0c621e31dd5bceaf0b42654cb12]
---
 projects/hip/packaging/hip-base.postinst | 3 ++-
 projects/hip/packaging/hip-base.prerm    | 1 +
 projects/hip/packaging/hip-base.txt      | 5 +++--
 projects/hip/packaging/hip-nvcc.txt      | 1 -
 projects/hip/packaging/hip-rocclr.txt    | 1 -
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/projects/hip/packaging/hip-base.postinst b/projects/hip/packaging/hip-base.postinst
index ebc04c05b8..5df8adab62 100755
--- a/projects/hip/packaging/hip-base.postinst
+++ b/projects/hip/packaging/hip-base.postinst
@@ -45,4 +45,5 @@ cd $CURRENTDIR
 # The following will be removed after upstream updation
 cd $HIPINCDIR
     ln -r -s -f amd_detail hcc_detail
-cd $CURRENTDIR
\ No newline at end of file
+    ln -r -s -f nvidia_detail nvcc_detail
+cd $CURRENTDIR
diff --git a/projects/hip/packaging/hip-base.prerm b/projects/hip/packaging/hip-base.prerm
index 895645f21a..07a2bbf35d 100755
--- a/projects/hip/packaging/hip-base.prerm
+++ b/projects/hip/packaging/hip-base.prerm
@@ -41,6 +41,7 @@ rmdir --ignore-fail-on-non-empty $ROCMBINDIR
 HIPINCDIR=$HIPDIR/include
 cd $HIPINCDIR/hip
 rm hcc_detail
+rm nvcc_detail
 cd $CURRENTDIR
 
 ROCMINCDIR=$ROCMDIR/include
diff --git a/projects/hip/packaging/hip-base.txt b/projects/hip/packaging/hip-base.txt
index 82d30dc92f..efd4357229 100644
--- a/projects/hip/packaging/hip-base.txt
+++ b/projects/hip/packaging/hip-base.txt
@@ -22,8 +22,9 @@ cmake_minimum_required(VERSION 2.8.3)
 project(hip_base)
 
 install(DIRECTORY @hip_SOURCE_DIR@/bin DESTINATION . USE_SOURCE_PERMISSIONS)
-# The following 'ATTERN "hcc_detail" EXCLUDE' will be removed after upstream updation
-install(DIRECTORY @hip_SOURCE_DIR@/include DESTINATION . PATTERN "hcc_detail" EXCLUDE)
+install(DIRECTORY @hip_SOURCE_DIR@/include DESTINATION .)
+install(DIRECTORY @HIP_AMD_BACKEND_SOURCE_DIR@/include/hip/amd_detail DESTINATION include/hip)
+install(DIRECTORY @HIP_AMD_BACKEND_SOURCE_DIR@/include/hip/nvidia_detail DESTINATION include/hip)
 install(FILES @PROJECT_BINARY_DIR@/include/hip/amd_detail/hip_prof_str.h
         DESTINATION include/hip/amd_detail)
 install(FILES @PROJECT_BINARY_DIR@/include/hip/hip_version.h
diff --git a/projects/hip/packaging/hip-nvcc.txt b/projects/hip/packaging/hip-nvcc.txt
index db7eaf0988..88e0a8ffb4 100644
--- a/projects/hip/packaging/hip-nvcc.txt
+++ b/projects/hip/packaging/hip-nvcc.txt
@@ -20,7 +20,6 @@
 
 cmake_minimum_required(VERSION 2.8.3)
 project(hip_nvcc)
-install(DIRECTORY @PROJECT_BINARY_DIR@/include/hip/nvcc_detail DESTINATION .)
 
 #############################
 # Packaging steps
diff --git a/projects/hip/packaging/hip-rocclr.txt b/projects/hip/packaging/hip-rocclr.txt
index da346a981b..ccff0d0358 100644
--- a/projects/hip/packaging/hip-rocclr.txt
+++ b/projects/hip/packaging/hip-rocclr.txt
@@ -29,7 +29,6 @@ else()
     install(FILES @PROJECT_BINARY_DIR@/lib/libamdhip64.a DESTINATION lib)
 endif()
 
-install(DIRECTORY @PROJECT_BINARY_DIR@/include/hip/amd_detail DESTINATION .)
 install(FILES @PROJECT_BINARY_DIR@/.hipInfo DESTINATION lib)
 install(FILES @PROJECT_BINARY_DIR@/hip-config.cmake @PROJECT_BINARY_DIR@/hip-config-version.cmake DESTINATION lib/cmake/hip)
 install(FILES @PROJECT_BINARY_DIR@/src/hipamd/hip-lang-config.cmake @PROJECT_BINARY_DIR@/src/hipamd/hip-lang-config-version.cmake DESTINATION lib/cmake/hip-lang)