Merge branch 'release-staging/rocm-rel-6.3' into uai-rocm-6.3

ROCm · Sep 30, 2024 · 3385f5c · 3385f5c
2 parents 2a9f277 + 489ef56
commit 3385f5c
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 12 deletions.
diff --git a/.azuredevops/rocm-ci.yml b/.azuredevops/rocm-ci.yml
@@ -14,6 +14,7 @@ trigger:
   branches:
     include:
     - develop
+    - mainline
   paths:
     exclude:
     - .github
@@ -26,6 +27,7 @@ pr:
   branches:
     include:
     - develop
+    - mainline
   paths:
     exclude:
     - .github

diff --git a/docs/requirements.in b/docs/requirements.in
@@ -1,2 +1,2 @@
 sphinxcontrib-moderncmakedomain==3.29.0
-rocm-docs-core==1.4.0
+rocm-docs-core==1.6.2
diff --git a/docs/requirements.txt b/docs/requirements.txt
@@ -92,7 +92,7 @@ requests==2.32.3
     # via
     #   pygithub
     #   sphinx
-rocm-docs-core==1.4.0
+rocm-docs-core==1.6.2
     # via -r requirements.in
 smmap==5.0.1
     # via gitdb
@@ -136,8 +136,6 @@ sphinxcontrib-qthelp==1.0.7
     # via sphinx
 sphinxcontrib-serializinghtml==1.1.10
     # via sphinx
-tomli==2.0.1
-    # via sphinx
 typing-extensions==4.12.2
     # via
     #   pydata-sphinx-theme

diff --git a/share/rocmcmakebuildtools/cmake/ROCMCreatePackage.cmake b/share/rocmcmakebuildtools/cmake/ROCMCreatePackage.cmake
@@ -336,14 +336,29 @@ macro(rocm_create_package)
             )
         endif()
         if(PARSE_HEADER_ONLY OR NOT BUILD_SHARED_LIBS)
-            rocm_join_if_set(", "
-                CPACK_DEBIAN_DEVEL_PACKAGE_PROVIDES
-                CPACK_DEBIAN_PACKAGE_PROVIDES
-                "${CPACK_PACKAGE_NAME} (= ${CPACK_PACKAGE_VERSION})")
-            rocm_join_if_set(", "
-                CPACK_RPM_DEVEL_PACKAGE_PROVIDES
-                CPACK_DEBIAN_PACKAGE_PROVIDES
-                "${CPACK_PACKAGE_NAME} = ${CPACK_PACKAGE_VERSION}")
+            if(DEFINED CPACK_DEBIAN_DEVEL_PACKAGE_PROVIDES)
+                rocm_join_if_set(", "
+                    CPACK_DEBIAN_DEVEL_PACKAGE_PROVIDES
+                    "${CPACK_PACKAGE_NAME} (= ${CPACK_PACKAGE_VERSION})"
+                )
+            else()
+                rocm_join_if_set(", "
+                    CPACK_DEBIAN_DEVEL_PACKAGE_PROVIDES
+                    "${CPACK_DEBIAN_PACKAGE_PROVIDES}"
+                    "${CPACK_PACKAGE_NAME} (= ${CPACK_PACKAGE_VERSION})")
+            endif()
+
+            if(DEFINED CPACK_RPM_DEVEL_PACKAGE_PROVIDES)
+                rocm_join_if_set(", "
+                    CPACK_RPM_DEVEL_PACKAGE_PROVIDES
+                    "${CPACK_PACKAGE_NAME}"
+                )
+            else()
+                rocm_join_if_set(", "
+                    CPACK_RPM_DEVEL_PACKAGE_PROVIDES
+                    "${CPACK_RPM_PACKAGE_PROVIDES}"
+                    "${CPACK_PACKAGE_NAME}")
+            endif()
         else()
             rocm_package_add_dependencies(COMPONENT devel DEPENDS "${CPACK_PACKAGE_NAME} >= ${CPACK_PACKAGE_VERSION}")
         endif()