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

generate_source_tarball.sh: Fix whitespace

Browse Source 
Related: RHEL-30946
This commit is contained in:
Thomas Fitzsimmons 2024-01-29 13:03:03 -05:00 committed by Andrew Hughes
parent 1f3242fb02
commit c30782ba7c
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

@ -186,28 +186,28 @@ 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}"
# 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
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-21-openjdk.spec
View File

@ -2527,6 +2527,7 @@ cjc.mainProgram(args)
- generate_source_tarball.sh: shellcheck: Do not use $ on arithmetic variables (SC2004) - generate_source_tarball.sh: shellcheck: Do not use $ on arithmetic variables (SC2004)
- Use backward-compatible patch syntax - Use backward-compatible patch syntax
- generate_source_tarball.sh: Ignore -ga tags with OPENJDK_LATEST - generate_source_tarball.sh: Ignore -ga tags with OPENJDK_LATEST
- generate_source_tarball.sh: Fix whitespace
- Related: RHEL-30946 - Related: RHEL-30946
* Sun Apr 14 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.3.0.1-0.2.ea * Sun Apr 14 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.3.0.1-0.2.ea