From 4d88210c12b3c4f8e0db81aea9ae81bf4dd3696f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Neal=20Gompa=20=28=E3=83=8B=E3=83=BC=E3=83=AB=E3=83=BB?= =?UTF-8?q?=E3=82=B4=E3=83=B3=E3=83=91=29?= Date: Thu, 13 May 2021 18:14:02 -0400 Subject: [PATCH] distribution/packages: Fix filename format for deb archives (#621) Debian packages are formatted with the following filename structure: name_[epoch:]version-release_arch.deb Make generated Debian packages follow this convention. Signed-off-by: Neal Gompa --- distribution/packages/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/distribution/packages/build.gradle b/distribution/packages/build.gradle index c7eaadfdfcf..0384f85b581 100644 --- a/distribution/packages/build.gradle +++ b/distribution/packages/build.gradle @@ -134,9 +134,9 @@ Closure commonPackageConfig(String type, boolean jdk, String architecture) { destinationDirectory = file("${prefix}/build/distributions") // SystemPackagingTask overrides default archive task convention mappings, but doesn't provide a setter so we have to override the convention mapping itself - // Deb convention uses a '-' for final separator before architecture, rpm uses a '.' + // Deb convention uses a '_' for final separator before architecture, rpm uses a '.' if (type == 'deb') { - conventionMapping.archiveFile = { objects.fileProperty().fileValue(file("${destinationDirectory.get()}/${packageName}-${project.version}${jdkString}-${archString}.${type}")) } + conventionMapping.archiveFile = { objects.fileProperty().fileValue(file("${destinationDirectory.get()}/${packageName}_${project.version}${jdkString}_${archString}.${type}")) } } else { conventionMapping.archiveFile = { objects.fileProperty().fileValue(file("${destinationDirectory.get()}/${packageName}-${project.version}${jdkString}.${archString}.${type}")) } }