Public/VeraCrypt
1
0
Fork 0
mirror of https://github.com/veracrypt/VeraCrypt.git synced 2025-11-11 02:58:02 -06:00
Code Activity

Linux Debian/Ubuntu: use a distro-specific version string to avoid APT repository conflicts

Browse Source 
In a Debian-style APT repository, the pool/ directory groups packages primarily by source package name and binary package name, version, architecture, etc. If two distinct .deb files have identical name and version (as seen in their control file) and same architecture, reprepro will report a conflict when adding one after the other.

So, we need to append distro-specific string to the existing version in order to avoid such conflict when creating VeraCrypt APT repository.
This commit is contained in:
Mounir IDRASSI
2025-01-11 16:23:11 +01:00
parent e8e0be2ad5
commit cc2f177c5c
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Build/CMakeLists.txt
View File

@@ -252,7 +252,19 @@ if ( ( PLATFORM STREQUAL "Debian" ) OR ( PLATFORM STREQUAL "Ubuntu" ) )
set( CPACK_GENERATOR "DEB" ) # mandatory
set( CPACK_DEBIAN_PACKAGE_NAME ${CPACK_PACKAGE_NAME} ) # mandatory
set( CPACK_DEBIAN_FILE_NAME ${CPACK_PACKAGE_FILE_NAME}.deb ) # mandatory
set( CPACK_DEBIAN_PACKAGE_VERSION ${CPACK_PACKAGE_VERSION} ) # mandatory
# -- Use a distro-specific version string to avoid repository conflicts --
# e.g. 1.26.17-1~deb11, 1.26.17-1~deb12, 1.26.17-1~ubuntu20.04, etc.
if (PLATFORM STREQUAL "Ubuntu")
# For something like "24.04", it becomes 1.26.17-1~ubuntu24.04
set(CPACK_DEBIAN_PACKAGE_VERSION
"${VERSION}-${RELEASE}~ubuntu${PLATFORM_VERSION}")
else() # Debian
# Usually just take the major number from e.g. "11.7" => "11"
string(REGEX MATCH "^[0-9]+" PLATFORM_VERSION_MAJOR "${PLATFORM_VERSION}")
set(CPACK_DEBIAN_PACKAGE_VERSION
"${VERSION}-${RELEASE}~deb${PLATFORM_VERSION_MAJOR}")
endif()
set( CPACK_DEBIAN_PACKAGE_RELEASE ${CPACK_PACKAGE_RELEASE} )
set( CPACK_DEBIAN_PACKAGE_ARCHITECTURE ${ARCHITECTURE} ) # mandatory