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

This commit is contained in:
Thomas Fitzsimmons 2024-02-01 16:44:28 -05:00
commit 579c52c187
2 changed files with 4 additions and 3 deletions

View file

@ -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 \

View file

@ -1732,6 +1732,7 @@ done
- 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
* Wed Jan 31 2024 Thomas Fitzsimmons <fitzsim@redhat.com> - 1:17.0.11.0.1-0.1.ea
- Update to jdk-17.0.11+1 (EA)