mirror of
https://gitlab.kitware.com/cmake/cmake.git
synced 2026-10-07 04:02:23 +03:00
Merge topic 'cpack-deb-dbgsym-md5sums'
1ef92d645d CPack/DEB: fix `md5sums` paths in dbgsym packages
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Sergey Tsatsulin <tsatsulin@gmail.com>
Merge-request: !11923
This commit is contained in:
commit
7bc4ff7c8a
2 files changed
+20
-1
No files matched your search
@@ -302,7 +302,7 @@ std::string DebGenerator::generateMD5File() const
|
||||
cmGeneratedFileStream out;
|
||||
out.Open(md5filename, false, true);
|
||||
|
||||
std::string topLevelWithTrailingSlash = cmStrCat(this->TemporaryDir, '/');
|
||||
std::string topLevelWithTrailingSlash = cmStrCat(this->WorkDir, '/');
|
||||
for (std::string const& file : this->PackageFiles) {
|
||||
// hash only regular files
|
||||
if (cmSystemTools::FileIsDirectory(file) ||
|
||||
|
||||
@@ -0,0 +1,19 @@
|
||||
if(NOT GENERATOR_TYPE STREQUAL "DEB")
|
||||
return()
|
||||
endif()
|
||||
|
||||
set(whitespaces_ "[\t\n\r ]*")
|
||||
set(hashsyms_ "[a-f0-9]+")
|
||||
|
||||
set(dbgsym_md5sums_md5sums
|
||||
"^(${hashsyms_} usr/lib/debug/\\.build-id/[^/\r\n]+/[^/\r\n]+\\.debug${whitespaces_})+$")
|
||||
set(dbgsym_md5sums_md5sums_permissions "-rw-r--r--")
|
||||
|
||||
if(PACKAGING_TYPE STREQUAL "COMPONENT")
|
||||
verifyDebControl("${FOUND_FILE_4}" "dbgsym_md5sums" "md5sums")
|
||||
verifyDebControl("${FOUND_FILE_5}" "dbgsym_md5sums" "md5sums")
|
||||
|
||||
elseif(PACKAGING_TYPE STREQUAL "MONOLITHIC")
|
||||
verifyDebControl("${FOUND_FILE_2}" "dbgsym_md5sums" "md5sums")
|
||||
|
||||
endif()
|
||||
Reference in new issue
Block a user