Skip to content

Commit 701bbf5

Browse files
authored
Lintian Warnings Fixes, Enhancements (#25)
* Add Lintian Warnings Fixes * Update Review Comments, Warning Fixes [ROCm/rocm-core commit: f774bf6]
1 parent 9a03917 commit 701bbf5

File tree

4 files changed

+13
-5
lines changed

4 files changed

+13
-5
lines changed

projects/rocm-core/CMakeLists.txt

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,10 @@ set( CPACK_GENERATOR "TGZ;DEB;RPM" CACHE STRING "package types to be produced "
6969
set( LICENSE_FILE "${CMAKE_CURRENT_SOURCE_DIR}/copyright" CACHE PATH "Path to License File in source dir" )
7070
set( BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR} )
7171
set( EXTENDED_PACKAGE_DESCRIPTION
72-
"ROCM-CORE is a package which can be used to get ROCm release version, get ROCm install path information etc.
73-
It is also important to note that ROCM-CORE takes the role as a base component on which all of ROCm can depend,
74-
to make it easy to remove all of ROCm with a package manager." CACHE STRING "Debian Package Extended Description")
72+
"ROCM-CORE package helps to get ROCm release version,get install path.
73+
It is also important to note that ROCM-CORE takes the role as a base
74+
component on which all of ROCm can depend, to make it easy to remove
75+
all of ROCm with a package manager." )
7576
7677
set( BUILD_ENABLE_LINTIAN_OVERRIDES OFF CACHE BOOL "Enable/Disable Lintian Overrides" )
7778
set( BUILD_DEBIAN_PKGING_FLAG OFF CACHE BOOL "Internal Status Flag to indicate Debian Packaging Build" )
@@ -141,7 +142,7 @@ if(BUILD_SHARED_LIBS)
141142
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/rocm-core
142143
COMPONENT CORE_RUNTIME )
143144
144-
install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/runpath_to_rpath.py
145+
install ( PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/runpath_to_rpath.py
145146
DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/rocm-core
146147
COMPONENT CORE_RUNTIME )
147148
install ( FILES ${BUILD_DIR}/rocmmod
@@ -263,10 +264,14 @@ endif()
263264
message(STATUS "Using CPACK_RPM_PACKAGE_RELEASE: ${CPACK_RPM_PACKAGE_RELEASE}")
264265
set ( CPACK_RPM_FILE_NAME "RPM-DEFAULT" )
265266
267+
# Debian Lintian Fix - Add Dependency for Python Script delivered
268+
set( DEB_DEPENDS_STRING "python3, libc6 (>= 2.34)" )
269+
266270
# Debian package specific variables
267271
set ( CPACK_DEBIAN_PACKAGE_DEPENDS ${DEB_DEPENDS_STRING} )
268272
set ( CPACK_DEBIAN_PACKAGE_HOMEPAGE "https://github.com/ROCm/rocm-core" )
269273
set ( CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${BUILD_DIR}/postinst;${BUILD_DIR}/prerm" )
274+
set ( CPACK_DEBIAN_CORE_RUNTIME_PACKAGE_DEPENDS ${DEB_DEPENDS_STRING} )
270275
set ( CPACK_DEBIAN_CORE_ASAN_PACKAGE_DEPENDS ${CORE_TARGET} )
271276
set ( CPACK_DEBIAN_CORE_RUNTIME_PACKAGE_CONTROL_EXTRA "${CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA}" )
272277
set ( CPACK_DEBIAN_CORE_STATIC_PACKAGE_CONTROL_EXTRA "${CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA}" )

projects/rocm-core/rocm-core.postinst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#!/bin/bash
2+
set -e
23

34
do_update_alternatives(){
45
# skip update if program doesn't exist

projects/rocm-core/rocm-core.prerm

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#!/bin/bash
2+
set -e
23

34
do_update_alternatives(){
45
# skip update if program doesn't exist

projects/rocm-core/utils.cmake

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,6 +220,7 @@ function( configure_debian_pkg PACKAGE_NAME_T COMPONENT_NAME_T PACKAGE_VERSION_T
220220
configure_file(
221221
"${CMAKE_SOURCE_DIR}/DEBIAN/overrides.in"
222222
"${CMAKE_BINARY_DIR}/DEBIAN/${DEB_OVERRIDES_INSTALL_FILENM}"
223+
FILE_PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
223224
@ONLY
224225
)
225226
endif()
@@ -228,7 +229,7 @@ function( configure_debian_pkg PACKAGE_NAME_T COMPONENT_NAME_T PACKAGE_VERSION_T
228229
find_program ( DEB_GZIP_EXEC gzip )
229230
if(EXISTS "${CMAKE_BINARY_DIR}/DEBIAN/changelog.Debian" )
230231
execute_process(
231-
COMMAND ${DEB_GZIP_EXEC} -9 "${CMAKE_BINARY_DIR}/DEBIAN/changelog.Debian"
232+
COMMAND ${DEB_GZIP_EXEC} -n -9 "${CMAKE_BINARY_DIR}/DEBIAN/changelog.Debian"
232233
WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/DEBIAN"
233234
RESULT_VARIABLE result
234235
OUTPUT_VARIABLE output

0 commit comments

Comments
 (0)