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

generate_source_tarball.sh: Fix whitespace

Browse Source 
- Related: RHEL-27133
This commit is contained in:
Thomas Fitzsimmons 2024-02-01 16:41:23 -05:00 committed by Andrew Hughes
parent a748d97faf
commit 829ee7a256
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
generate_source_tarball.sh
View File

@ -178,20 +178,20 @@ echo -e "\tTO_COMPRESS: ${TO_COMPRESS}"
echo -e "\tBOOT_JDK: ${BOOT_JDK}" echo -e "\tBOOT_JDK: ${BOOT_JDK}"
if [ -d "${FILE_NAME_ROOT}" ] ; then if [ -d "${FILE_NAME_ROOT}" ] ; then
echo "exists exists exists exists exists exists exists " echo "exists exists exists exists exists exists exists "
echo "reusing reusing reusing reusing reusing reusing " echo "reusing reusing reusing reusing reusing reusing "
echo "${FILE_NAME_ROOT}" echo "${FILE_NAME_ROOT}"
STAT_TIME="$(stat --format=%Y "${FILE_NAME_ROOT}")" STAT_TIME="$(stat --format=%Y "${FILE_NAME_ROOT}")"
TAR_TIME="$(date --date=@"${STAT_TIME}" --iso-8601=seconds)" TAR_TIME="$(date --date=@"${STAT_TIME}" --iso-8601=seconds)"
else else
mkdir "${FILE_NAME_ROOT}" mkdir "${FILE_NAME_ROOT}"
pushd "${FILE_NAME_ROOT}" pushd "${FILE_NAME_ROOT}"
echo "Cloning ${VERSION} root repository from ${REPO_ROOT}" echo "Cloning ${VERSION} root repository from ${REPO_ROOT}"
git clone --depth=1 -b "${VERSION}" "${REPO_ROOT}" "${VERSION}" git clone --depth=1 -b "${VERSION}" "${REPO_ROOT}" "${VERSION}"
pushd "${VERSION}" pushd "${VERSION}"
TAR_TIME="$(git log --max-count 1 --format=%cI)" TAR_TIME="$(git log --max-count 1 --format=%cI)"
popd
popd popd
popd
fi fi
pushd "${FILE_NAME_ROOT}" pushd "${FILE_NAME_ROOT}"
EA_PART="$(git tag --contains "${VERSION}" \ EA_PART="$(git tag --contains "${VERSION}" \
@ -201,8 +201,8 @@ pushd "${FILE_NAME_ROOT}"
# created from # created from
mkdir build mkdir build
pushd build pushd build
sh "${PWD}"/../"${VERSION}"/configure --with-boot-jdk="${BOOT_JDK}" sh "${PWD}"/../"${VERSION}"/configure --with-boot-jdk="${BOOT_JDK}"
make store-source-revision make store-source-revision
popd popd
rm -rf build rm -rf build

1
java-17-openjdk.spec
View File

@ -2490,6 +2490,7 @@ require "copy_jdk_configs.lua"
- Update buildjdkver to match the featurever - Update buildjdkver to match the featurever
- Use featurever macro to specify fips patch - Use featurever macro to specify fips patch
- Explain patchN syntax situation in a comment - Explain patchN syntax situation in a comment
- generate_source_tarball.sh: Fix whitespace
- 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