rpms/java-17-openjdk
5
0
Fork 0
Code Issues Pull Requests Releases Activity

generate_source_tarball.sh: Get -ea suffix from version-numbers.conf

Browse Source 
- Related: RHEL-27133
This commit is contained in:
Thomas Fitzsimmons 2024-02-01 16:44:28 -05:00 committed by Andrew Hughes
parent bf109bbddb
commit 53fdb2b6a8
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
generate_source_tarball.sh
View File

@ -202,9 +202,6 @@ else
popd popd
fi fi
pushd "${FILE_NAME_ROOT}" 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 # Generate .src-rev so build has knowledge of the revision the tarball was
# created from # created from
mkdir build mkdir build
@ -241,6 +238,9 @@ pushd "${FILE_NAME_ROOT}"
else else
SWITCH=czf SWITCH=czf
fi 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} TARBALL_NAME=${FILE_NAME_ROOT}${EA_PART}.tar.${COMPRESSION}
XZ_OPT=${XZ_OPT-"-T0"} \ XZ_OPT=${XZ_OPT-"-T0"} \
tar --mtime="${TAR_TIME}" --owner=root --group=root --sort=name \ tar --mtime="${TAR_TIME}" --owner=root --group=root --sort=name \

1
java-17-openjdk.spec
View File

@ -2492,6 +2492,7 @@ require "copy_jdk_configs.lua"
- Explain patchN syntax situation in a comment - Explain patchN syntax situation in a comment
- generate_source_tarball.sh: Fix whitespace - generate_source_tarball.sh: Fix whitespace
- generate_source_tarball.sh: Skip -ga tags - generate_source_tarball.sh: Skip -ga tags
- generate_source_tarball.sh: Get -ea suffix from version-numbers.conf
- Related: RHEL-27133 - Related: RHEL-27133
* Thu Jan 11 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:17.0.10.0.7-2 * Thu Jan 11 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:17.0.10.0.7-2