diff --git a/CMakeLists.txt b/CMakeLists.txt index 444477c106..273335d7cd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -288,6 +288,9 @@ set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.md") set(CPACK_COMPONENT_DESCRIPTION "HSAKMT development package.\n This package includes the user-mode API interfaces\nused to interact with the ROCk driver.\n This package contains the headers, pkgonfig and\n cmake files for the ROCT package.") set ( ENABLE_LDCONFIG ON CACHE BOOL "Set library links and caches using ldconfig.") +# Install License file +install ( FILES ${CPACK_RESOURCE_FILE_LICENSE} DESTINATION ${CMAKE_INSTALL_DOCDIR}/${CPACK_PACKAGE_NAME} COMPONENT devel) + # Make proper version for appending # Default Value is 99999, setting it first set(ROCM_VERSION_FOR_PACKAGE "99999") @@ -307,11 +310,6 @@ if (DEFINED ENV{CPACK_DEBIAN_PACKAGE_RELEASE}) else() set(CPACK_DEBIAN_PACKAGE_RELEASE "local") endif() -# Logic to install debian copyright file (i.e. the license file) -set(CPACK_INSTALL_COMMANDS "install -m 644 -D ${CPACK_RESOURCE_FILE_LICENSE} \ - ${PROJECT_BINARY_DIR}/doc/${CPACK_DEBIAN_PACKAGE_NAME}/copyright") -set(CPACK_INSTALLED_DIRECTORIES "${PROJECT_BINARY_DIR}/doc/${CPACK_DEBIAN_PACKAGE_NAME}" - "/usr/share/doc/${CPACK_DEBIAN_PACKAGE_NAME}${CPACK_PACKAGE_VERSION}") ## Process the Debian install/remove scripts to update the CPACK variables configure_file ( ${CMAKE_CURRENT_SOURCE_DIR}/DEBIAN/postinst.in DEBIAN/postinst @ONLY ) configure_file ( ${CMAKE_CURRENT_SOURCE_DIR}/DEBIAN/prerm.in DEBIAN/prerm @ONLY ) diff --git a/RPM/hsakmt-roct-devel.spec.in b/RPM/hsakmt-roct-devel.spec.in index 2cc9e9f8ad..cb8b7e39b9 100644 --- a/RPM/hsakmt-roct-devel.spec.in +++ b/RPM/hsakmt-roct-devel.spec.in @@ -55,9 +55,6 @@ Recommends: @CPACK_RPM_PACKAGE_RECOMMENDS@ %prep mv $RPM_BUILD_ROOT %_topdir/tmpBBroot -# The license macro expects the license to be copied into the working directory -cp -a @CPACK_RESOURCE_FILE_LICENSE@ ./LICENSE.md - %install if [ -e $RPM_BUILD_ROOT ]; then @@ -94,10 +91,6 @@ mv %_topdir/tmpBBroot $RPM_BUILD_ROOT @CPACK_RPM_ABSOLUTE_INSTALL_FILES@ @CPACK_RPM_USER_INSTALL_FILES@ -# RPM has a different way of packaging the license, ignore the debian one: -%license LICENSE.md -%exclude /usr/share/doc/@CPACK_DEBIAN_PACKAGE_NAME@ - %changelog @CPACK_RPM_SPEC_CHANGELOG@