diff --git a/generate_source_tarball.sh b/generate_source_tarball.sh index 3fcdbfa..2132d89 100755 --- a/generate_source_tarball.sh +++ b/generate_source_tarball.sh @@ -202,9 +202,6 @@ else popd fi pushd "${FILE_NAME_ROOT}" - EA_PART="$(git tag --contains "${VERSION}" \ - | grep --quiet '\-ga$' || echo '-ea')" - # Generate .src-rev so build has knowledge of the revision the tarball was # created from mkdir build @@ -241,6 +238,9 @@ pushd "${FILE_NAME_ROOT}" else SWITCH=czf fi + EA_PART="$(awk -F= \ + '/^DEFAULT_PROMOTED_VERSION_PRE/ { if ($2) print "-"$2 }' \ + "${VERSION}"/make/conf/version-numbers.conf)" TARBALL_NAME=${FILE_NAME_ROOT}${EA_PART}.tar.${COMPRESSION} XZ_OPT=${XZ_OPT-"-T0"} \ tar --mtime="${TAR_TIME}" --owner=root --group=root --sort=name \ diff --git a/java-17-openjdk.spec b/java-17-openjdk.spec index 99cbce2..18fe123 100644 --- a/java-17-openjdk.spec +++ b/java-17-openjdk.spec @@ -2492,6 +2492,7 @@ require "copy_jdk_configs.lua" - Explain patchN syntax situation in a comment - generate_source_tarball.sh: Fix whitespace - generate_source_tarball.sh: Skip -ga tags +- generate_source_tarball.sh: Get -ea suffix from version-numbers.conf - Related: RHEL-27133 * Thu Jan 11 2024 Andrew Hughes - 1:17.0.10.0.7-2