mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-11 16:32:14 -06:00
Code Issues Packages Projects Releases Wiki Activity

CPack/DEB: Use the same compression type for control tar

Browse Source 
Uniform compression is the default since dpkg 1.19.0.
This commit is contained in:
kiwixz
2025-07-29 20:31:42 +02:00
parent 60502d75b7
commit 57eed59f35
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Source/CPack/cmCPackDebGenerator.cxx
View File

@@ -312,7 +312,8 @@ std::string DebGenerator::generateMD5File() const
bool DebGenerator::generateControlTar(std::string const& md5Filename) const
{
std::string filename_control_tar = this->WorkDir + "/control.tar.gz";
std::string filename_control_tar =
this->WorkDir + "/control.tar" + this->CompressionSuffix;
cmGeneratedFileStream fileStream_control_tar;
fileStream_control_tar.Open(filename_control_tar, false, true);
@@ -322,8 +323,7 @@ bool DebGenerator::generateControlTar(std::string const& md5Filename) const
<< filename_control_tar << "\" for writing" << std::endl);
return false;
}
cmArchiveWrite control_tar(fileStream_control_tar,
cmArchiveWrite::CompressGZip,
cmArchiveWrite control_tar(fileStream_control_tar, this->TarCompressionType,
this->DebianArchiveType);
if (!control_tar.Open()) {
cmCPackLogger(cmCPackLog::LOG_ERROR,
@@ -484,7 +484,8 @@ bool DebGenerator::generateDeb() const
deb.SetUNAMEAndGNAME("root", "root");
if (!deb.Add(tlDir + "debian-binary", tlDir.length()) ||
!deb.Add(tlDir + "control.tar.gz", tlDir.length()) ||
!deb.Add(tlDir + "control.tar" + this->CompressionSuffix,
tlDir.length()) ||
!deb.Add(tlDir + "data.tar" + this->CompressionSuffix, tlDir.length())) {
cmCPackLogger(cmCPackLog::LOG_ERROR,
"Error creating debian package:\n"