Update to aarch64-shenandoah-jdk8u272-b06.
Update tarball generation script to use PR3799, following inclusion of JDK-8245468 (TLSv1.3)
This commit is contained in:
Andrew Hughes
parent
5cf3d02401
commit
96b7bf4ad0
1
.gitignore
vendored
1
.gitignore
vendored
@ -202,3 +202,4 @@
|
||||
/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u272-b04-4curve.tar.xz
|
||||
/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u272-b05-4curve.tar.xz
|
||||
/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u272-b05-shenandoah-merge-2020-08-28-4curve.tar.xz
|
||||
/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u272-b06-4curve.tar.xz
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
# Example:
|
||||
# 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 you want to use a local copy of patch PR3795, set the path to it in the PR3795 variable
|
||||
# If you want to use a local copy of patch PR3799, set the path to it in the PR3799 variable
|
||||
#
|
||||
# In any case you have to set PROJECT_NAME REPO_NAME and VERSION. eg:
|
||||
# PROJECT_NAME=jdk8u OR aarch64-port
|
||||
@ -19,9 +19,9 @@
|
||||
# level folder, name is created, based on parameter
|
||||
#
|
||||
|
||||
if [ ! "x$PR3795" = "x" ] ; then
|
||||
if [ ! -f "$PR3795" ] ; then
|
||||
echo "You have specified PR3795 as $PR3795 but it does not exists. exiting"
|
||||
if [ ! "x$PR3799" = "x" ] ; then
|
||||
if [ ! -f "$PR3799" ] ; then
|
||||
echo "You have specified PR3799 as $PR3799 but it does not exists. exiting"
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
@ -41,7 +41,7 @@ if [ "x$1" = "xhelp" ] ; then
|
||||
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 "REPO_ROOT - the location of the Mercurial repository to archive (optional; defaults to OPENJDK_URL/PROJECT_NAME/REPO_NAME)"
|
||||
echo "PR3795 - the path to the PR3795 patch to apply (optional; downloaded if unavailable)"
|
||||
echo "PR3799 - the path to the PR3799 patch to apply (optional; downloaded if unavailable)"
|
||||
echo "REPOS - specify the repositories to use (optional; defaults to ${REPOS_DEFAULT})"
|
||||
exit 1;
|
||||
fi
|
||||
@ -124,15 +124,15 @@ rm -vf jdk/src/share/native/sun/security/ec/impl/ecp_224.c
|
||||
|
||||
echo "Syncing EC list with NSS"
|
||||
|
||||
if [ "x$PR3795" = "x" ] ; then
|
||||
# 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=3795)
|
||||
wget -O pr3795.patch http://icedtea.classpath.org/hg/icedtea8/raw-file/tip/patches/pr3795-4curve.patch
|
||||
patch -Np1 < pr3795.patch
|
||||
rm pr3795.patch
|
||||
if [ "x$PR3799" = "x" ] ; then
|
||||
# get pr3799.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=3799)
|
||||
wget -O pr3799.patch http://icedtea.classpath.org/hg/icedtea8/raw-file/tip/patches/pr3799-4curve.patch
|
||||
patch -Np1 < pr3799.patch
|
||||
rm pr3799.patch
|
||||
else
|
||||
echo "Applying ${PR3795}"
|
||||
patch -Np1 < $PR3795
|
||||
echo "Applying ${PR3799}"
|
||||
patch -Np1 < $PR3799
|
||||
fi;
|
||||
fi
|
||||
find . -name '*.orig' -exec rm -vf '{}' ';'
|
||||
|
||||
@ -244,7 +244,7 @@
|
||||
# note, following three variables are sedded from update_sources if used correctly. Hardcode them rather there.
|
||||
%global shenandoah_project aarch64-port
|
||||
%global shenandoah_repo jdk8u-shenandoah
|
||||
%global shenandoah_revision aarch64-shenandoah-jdk8u272-b05-shenandoah-merge-2020-08-28
|
||||
%global shenandoah_revision aarch64-shenandoah-jdk8u272-b06
|
||||
# Define old aarch64/jdk8u tree variables for compatibility
|
||||
%global project %{shenandoah_project}
|
||||
%global repo %{shenandoah_repo}
|
||||
@ -260,7 +260,7 @@
|
||||
%global updatever %(VERSION=%{whole_update}; echo ${VERSION##*u})
|
||||
# eg jdk8u60-b27 -> b27
|
||||
%global buildver %(VERSION=%{version_tag}; echo ${VERSION##*-})
|
||||
%global rpmrelease 1
|
||||
%global rpmrelease 0
|
||||
# Define milestone (EA for pre-releases, GA ("fcs") for releases)
|
||||
# Release will be (where N is usually a number starting at 1):
|
||||
# - 0.N%%{?extraver}%%{?dist} for EA releases,
|
||||
@ -2403,6 +2403,10 @@ require "copy_jdk_configs.lua"
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Thu Sep 03 2020 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.272.b06-0.0.ea
|
||||
- Update to aarch64-shenandoah-jdk8u272-b06.
|
||||
- Update tarball generation script to use PR3799, following inclusion of JDK-8245468 (TLSv1.3)
|
||||
|
||||
* Wed Sep 02 2020 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.272.b05-0.1.ea
|
||||
- Update to aarch64-shenandoah-jdk8u272-b05-shenandoah-merge-2020-08-28.
|
||||
- Add additional s390 log2_intptr case in shenandoahUtils.cpp introduced by JDK-8245464
|
||||
|
||||
2
sources
2
sources
@ -1,2 +1,2 @@
|
||||
SHA512 (tapsets-icedtea-3.15.0.tar.xz) = c752a197cb3d812d50c35e11e4722772be40096c81d2a57933e0d9b8a3c708b9c157b8108a4e33a06ca7bb81648170994408c75d6f69d5ff12785d0c31009671
|
||||
SHA512 (aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u272-b05-shenandoah-merge-2020-08-28-4curve.tar.xz) = 0b97e71fda79399179439aa850edd7228e8ea318be09e80e1a1c380a145cdb968e3a22a27d4b388d9cc28ec52de2815aa67e0931e998c79ff47f122e26f31b2d
|
||||
SHA512 (aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u272-b06-4curve.tar.xz) = cb5ae7eed7b535d429463d830423ef9de335d97d64eaac0bd770b57045587b9387ed139b8c67d44597d37222d80e6f4f1f936265fd4c85f339b141c7f9946d49
|
||||
|
||||
Loading…
Reference in New Issue
Block a user