Update to aarch64-shenandoah-jdk8u272-b04.

Update tarball generation script to use PR3795, following inclusion of JDK-8177334
This commit is contained in:
Andrew Hughes 2020-08-30 01:38:59 +00:00
parent 376c4dd81a
commit 92edf1fe1e
4 changed files with 20 additions and 15 deletions

1
.gitignore vendored
View File

@ -199,3 +199,4 @@
/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u272-b01-4curve.tar.xz /aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u272-b01-4curve.tar.xz
/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u272-b02-4curve.tar.xz /aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u272-b02-4curve.tar.xz
/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u272-b03-4curve.tar.xz /aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u272-b03-4curve.tar.xz
/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u272-b04-4curve.tar.xz

View File

@ -4,7 +4,7 @@
# Example: # Example:
# When used from local repo set REPO_ROOT pointing to file:// with your repo # When used from local repo set REPO_ROOT pointing to file:// with your repo
# If your local repo follows upstream forests conventions, it may be enough to set OPENJDK_URL # If your local repo follows upstream forests conventions, it may be enough to set OPENJDK_URL
# If you want to use a local copy of patch PR3756, set the path to it in the PR3756 variable # If you want to use a local copy of patch PR3795, set the path to it in the PR3795 variable
# #
# In any case you have to set PROJECT_NAME REPO_NAME and VERSION. eg: # In any case you have to set PROJECT_NAME REPO_NAME and VERSION. eg:
# PROJECT_NAME=jdk8u OR aarch64-port # PROJECT_NAME=jdk8u OR aarch64-port
@ -19,9 +19,9 @@
# level folder, name is created, based on parameter # level folder, name is created, based on parameter
# #
if [ ! "x$PR3756" = "x" ] ; then if [ ! "x$PR3795" = "x" ] ; then
if [ ! -f "$PR3756" ] ; then if [ ! -f "$PR3795" ] ; then
echo "You have specified PR3756 as $PR3756 but it does not exists. exiting" echo "You have specified PR3795 as $PR3795 but it does not exists. exiting"
exit 1 exit 1
fi fi
fi fi
@ -41,7 +41,7 @@ if [ "x$1" = "xhelp" ] ; then
echo "COMPRESSION - the compression type to use (optional; defaults to ${COMPRESSION_DEFAULT})" echo "COMPRESSION - the compression type to use (optional; defaults to ${COMPRESSION_DEFAULT})"
echo "FILE_NAME_ROOT - name of the archive, minus extensions (optional; defaults to PROJECT_NAME-REPO_NAME-VERSION)" echo "FILE_NAME_ROOT - name of the archive, minus extensions (optional; defaults to PROJECT_NAME-REPO_NAME-VERSION)"
echo "REPO_ROOT - the location of the Mercurial repository to archive (optional; defaults to OPENJDK_URL/PROJECT_NAME/REPO_NAME)" echo "REPO_ROOT - the location of the Mercurial repository to archive (optional; defaults to OPENJDK_URL/PROJECT_NAME/REPO_NAME)"
echo "PR3756 - the path to the PR3756 patch to apply (optional; downloaded if unavailable)" echo "PR3795 - the path to the PR3795 patch to apply (optional; downloaded if unavailable)"
echo "REPOS - specify the repositories to use (optional; defaults to ${REPOS_DEFAULT})" echo "REPOS - specify the repositories to use (optional; defaults to ${REPOS_DEFAULT})"
exit 1; exit 1;
fi fi
@ -124,15 +124,15 @@ rm -vf jdk/src/share/native/sun/security/ec/impl/ecp_224.c
echo "Syncing EC list with NSS" echo "Syncing EC list with NSS"
if [ "x$PR3756" = "x" ] ; then if [ "x$PR3795" = "x" ] ; then
# get pr3756.patch (from http://icedtea.classpath.org/hg/icedtea8) from most correct tag # get pr3795.patch (from http://icedtea.classpath.org/hg/icedtea8) from most correct tag
# Do not push it or publish it (see http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=3756) # Do not push it or publish it (see http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=3795)
wget http://icedtea.classpath.org/hg/icedtea8/raw-file/tip/patches/pr3756.patch wget -O pr3795.patch http://icedtea.classpath.org/hg/icedtea8/raw-file/tip/patches/pr3795-4curve.patch
patch -Np1 < pr3756.patch patch -Np1 < pr3795.patch
rm pr3756.patch rm pr3795.patch
else else
echo "Applying ${PR3756}" echo "Applying ${PR3795}"
patch -Np1 < $PR3756 patch -Np1 < $PR3795
fi; fi;
fi fi
find . -name '*.orig' -exec rm -vf '{}' ';' find . -name '*.orig' -exec rm -vf '{}' ';'

View File

@ -244,7 +244,7 @@
# note, following three variables are sedded from update_sources if used correctly. Hardcode them rather there. # note, following three variables are sedded from update_sources if used correctly. Hardcode them rather there.
%global shenandoah_project aarch64-port %global shenandoah_project aarch64-port
%global shenandoah_repo jdk8u-shenandoah %global shenandoah_repo jdk8u-shenandoah
%global shenandoah_revision aarch64-shenandoah-jdk8u272-b03 %global shenandoah_revision aarch64-shenandoah-jdk8u272-b04
# Define old aarch64/jdk8u tree variables for compatibility # Define old aarch64/jdk8u tree variables for compatibility
%global project %{shenandoah_project} %global project %{shenandoah_project}
%global repo %{shenandoah_repo} %global repo %{shenandoah_repo}
@ -2403,6 +2403,10 @@ require "copy_jdk_configs.lua"
%endif %endif
%changelog %changelog
* Wed Aug 19 2020 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.272.b04-0.0.ea
- Update to aarch64-shenandoah-jdk8u272-b04.
- Update tarball generation script to use PR3795, following inclusion of JDK-8177334
* Wed Aug 19 2020 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.272.b03-0.0.ea * Wed Aug 19 2020 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.272.b03-0.0.ea
- Update to aarch64-shenandoah-jdk8u272-b03. - Update to aarch64-shenandoah-jdk8u272-b03.

View File

@ -1,2 +1,2 @@
SHA512 (tapsets-icedtea-3.15.0.tar.xz) = c752a197cb3d812d50c35e11e4722772be40096c81d2a57933e0d9b8a3c708b9c157b8108a4e33a06ca7bb81648170994408c75d6f69d5ff12785d0c31009671 SHA512 (tapsets-icedtea-3.15.0.tar.xz) = c752a197cb3d812d50c35e11e4722772be40096c81d2a57933e0d9b8a3c708b9c157b8108a4e33a06ca7bb81648170994408c75d6f69d5ff12785d0c31009671
SHA512 (aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u272-b03-4curve.tar.xz) = 391b3662d7fa8687d93468f0b9e9731d0678c05bb60367a25df0fdab1dbbe3cf28cda14f75baeda35fd7e5e48d85a3579bcc427ab5ce4bd7d60b016bc054e960 SHA512 (aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u272-b04-4curve.tar.xz) = 095c117c613fcb1322fd9f0eabbfa52cac3680c671588180a620d3423324934c295d2c25959bda1421de1336d9462ab43b254a7a09b19107c86a55830eb60c7b