Merge branch 'ROCm:main' into SWDEV-479652-perfetto

ROCm · Sep 6, 2024 · 3ff3568 · 3ff3568
2 parents f300b80 + a9face6
commit 3ff3568
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 1 deletion.
diff --git a/.github/workflows/cpack.yml b/.github/workflows/cpack.yml
@@ -130,6 +130,12 @@ jobs:
           - os-distro: "opensuse"
             os-version: "15.5"
             rocm-version: "0.0"
+          - os-distro: "opensuse"
+            os-version: "15.5"
+            rocm-version: "5.6"
+          - os-distro: "opensuse"
+            os-version: "15.5"
+            rocm-version: "5.7"
           - os-distro: "opensuse"
             os-version: "15.5"
             rocm-version: "6.0"

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -395,6 +395,11 @@ install(
     DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/modulefiles/${PROJECT_NAME}
     COMPONENT setup)
 
+install(
+    FILES ${PROJECT_SOURCE_DIR}/LICENSE
+    DESTINATION ${CMAKE_INSTALL_DOCDIR}
+    COMPONENT setup)
+
 # ------------------------------------------------------------------------------#
 #
 # install

diff --git a/cmake/ConfigCPack.cmake b/cmake/ConfigCPack.cmake
@@ -214,6 +214,7 @@ set(CPACK_RPM_PACKAGE_PROVIDES
     "${CPACK_RPM_PACKAGE_PROVIDES}"
     CACHE STRING "RPM package provides" FORCE)
 
+set(CPACK_RPM_PACKAGE_LICENSE "MIT")
 set(CPACK_RPM_FILE_NAME "RPM-DEFAULT")
 set(CPACK_RPM_PACKAGE_RELEASE_DIST ON)
 set(CPACK_RPM_PACKAGE_AUTOREQPROV ON)

diff --git a/docs/sphinx/requirements.txt b/docs/sphinx/requirements.txt
@@ -31,7 +31,7 @@ click==8.1.7
     #   sphinx-external-toc
 click-log==0.4.0
     # via doxysphinx
-cryptography==42.0.8
+cryptography==43.0.1
     # via pyjwt
 deprecated==1.2.14
     # via pygithub