From c867f608e3471506aea129a45d31aa10d815b389 Mon Sep 17 00:00:00 2001 From: Andrew Hughes Date: Tue, 15 Feb 2022 16:45:42 +0000 Subject: [PATCH] Update to aarch64-shenandoah-jdk8u322-b05 (EA) Update release notes for 8u322-b05. Require tzdata 2021e as of JDK-8275766. Update tarball generation script to use git following shenandoah-jdk8u's move to github --- .gitignore | 1 + NEWS | 3 +++ generate_source_tarball.sh | 18 ++++++------------ java-1.8.0-openjdk.spec | 22 ++++++++++++++-------- sources | 2 +- 5 files changed, 25 insertions(+), 21 deletions(-) diff --git a/.gitignore b/.gitignore index f1536da..a986941 100644 --- a/.gitignore +++ b/.gitignore @@ -250,3 +250,4 @@ /aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u322-b02-4curve.tar.xz /aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u322-b03-4curve.tar.xz /aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u322-b04-4curve.tar.xz +/openjdk-shenandoah-jdk8u-aarch64-shenandoah-jdk8u322-b05-4curve.tar.xz diff --git a/NEWS b/NEWS index 9773926..b8a1f92 100644 --- a/NEWS +++ b/NEWS @@ -63,6 +63,9 @@ Live versions of these release notes can be found at: - JDK-8274468: TimeZoneTest.java fails with tzdata2021b - JDK-8274595: DisableRMIOverHTTPTest failed: connection refused - JDK-8274779: HttpURLConnection: HttpClient and HttpsClient incorrectly check request method when set to POST + - JDK-8275766: (tz) Update Timezone Data to 2021e + - JDK-8275849: TestZoneInfo310.java fails with tzdata2021e + - JDK-8276536: Update TimeZoneNames files to follow the changes made by JDK-8275766 Notes on individual issues: =========================== diff --git a/generate_source_tarball.sh b/generate_source_tarball.sh index c6f0756..61aad1f 100755 --- a/generate_source_tarball.sh +++ b/generate_source_tarball.sh @@ -7,9 +7,9 @@ # If you want to use a local copy of patch PR3822, set the path to it in the PR3822 variable # # In any case you have to set PROJECT_NAME REPO_NAME and VERSION. eg: -# PROJECT_NAME=jdk8u OR aarch64-port -# REPO_NAME=jdk8u60 OR jdk8u60 -# VERSION=jdk8u60-b27 OR aarch64-jdk8u65-b17 OR for head, keyword 'tip' should do the job there +# PROJECT_NAME=openjdk +# REPO_NAME=shenandoah-jdk8u +# VERSION=HEAD # # They are used to create correct name and are used in construction of sources url (unless REPO_ROOT is set) @@ -40,7 +40,7 @@ fi set -e -OPENJDK_URL_DEFAULT=http://hg.openjdk.java.net +OPENJDK_URL_DEFAULT=https://github.com COMPRESSION_DEFAULT=xz # jdk is last for its size REPOS_DEFAULT="hotspot corba jaxws jaxp langtools nashorn jdk" @@ -99,7 +99,7 @@ if [ "x$FILE_NAME_ROOT" = "x" ] ; then echo "No file name root specified; default to ${FILE_NAME_ROOT}" fi if [ "x$REPO_ROOT" = "x" ] ; then - REPO_ROOT="${OPENJDK_URL}/${PROJECT_NAME}/${REPO_NAME}" + REPO_ROOT="${OPENJDK_URL}/${PROJECT_NAME}/${REPO_NAME}.git" echo "No repository root specified; default to ${REPO_ROOT}" fi; if [ "x$REPOS" = "x" ] ; then @@ -123,15 +123,9 @@ mkdir "${FILE_NAME_ROOT}" pushd "${FILE_NAME_ROOT}" echo "Cloning ${VERSION} root repository from ${REPO_ROOT}" -hg clone ${REPO_ROOT} openjdk -r ${VERSION} +git clone -b ${VERSION} ${REPO_ROOT} openjdk pushd openjdk -for subrepo in ${REPOS} -do - echo "Cloning ${VERSION} ${subrepo} repository from ${REPO_ROOT}" - hg clone ${REPO_ROOT}/${subrepo} -r ${VERSION} -done - # UnderlineTaglet.java has a BSD license with a field-of-use restriction, making it non-Free if [ -d langtools ] ; then echo "Removing langtools test case with non-Free license" diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec index 9dc6a8a..f65ab51 100644 --- a/java-1.8.0-openjdk.spec +++ b/java-1.8.0-openjdk.spec @@ -327,9 +327,9 @@ %endif # 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-jdk8u322-b04 +%global shenandoah_project openjdk +%global shenandoah_repo shenandoah-jdk8u +%global shenandoah_revision aarch64-shenandoah-jdk8u322-b05 # Define old aarch64/jdk8u tree variables for compatibility %global project %{shenandoah_project} %global repo %{shenandoah_repo} @@ -344,7 +344,7 @@ %global updatever %(VERSION=%{whole_update}; echo ${VERSION##*u}) # eg jdk8u60-b27 -> b27 %global buildver %(VERSION=%{version_tag}; echo ${VERSION##*-}) -%global rpmrelease 3 +%global rpmrelease 1 # 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, @@ -1141,8 +1141,8 @@ Requires: ca-certificates # Require javapackages-filesystem for ownership of /usr/lib/jvm/ and macros Requires: javapackages-filesystem # Require zoneinfo data provided by tzdata-java subpackage. -# 2021c required as of JDK-8274407 in January 2022 CPU -Requires: tzdata-java >= 2021c +# 2021e required as of JDK-8275766 in January 2022 CPU +Requires: tzdata-java >= 2021e # for support of kernel stream control # libsctp.so.1 is being `dlopen`ed on demand Requires: lksctp-tools%{?_isa} @@ -1514,8 +1514,8 @@ BuildRequires: java-%{buildjdkver}-openjdk-devel >= 1.7.0.151-2.6.11.3 %ifarch %{zero_arches} BuildRequires: libffi-devel %endif -# 2021c required as of JDK-8274407 in January 2022 CPU -BuildRequires: tzdata-java >= 2021c +# 2021e required as of JDK-8275766 in January 2022 CPU +BuildRequires: tzdata-java >= 2021e # Earlier versions have a bug in tree vectorization on PPC BuildRequires: gcc >= 4.8.3-8 @@ -2683,6 +2683,12 @@ cjc.mainProgram(args) %endif %changelog +* Tue Feb 15 2022 Andrew Hughes - 1:1.8.0.322.b05-0.1.ea +- Update to aarch64-shenandoah-jdk8u322-b05 (EA) +- Update release notes for 8u322-b05. +- Require tzdata 2021e as of JDK-8275766. +- Update tarball generation script to use git following shenandoah-jdk8u's move to github + * Mon Feb 07 2022 Severin Gehwolf - 1:1.8.0.322.b04-0.3.ea - Re-enable gdb backtrace check. diff --git a/sources b/sources index eb1f71f..12cd6db 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (tapsets-icedtea-3.15.0.tar.xz) = c752a197cb3d812d50c35e11e4722772be40096c81d2a57933e0d9b8a3c708b9c157b8108a4e33a06ca7bb81648170994408c75d6f69d5ff12785d0c31009671 -SHA512 (aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u322-b04-4curve.tar.xz) = ebc3cceb40f7ca567fd9fe751ba9762ad50ac474f63da5e2123cf268683db10132ffb09b6f6a99b3379c021b4fcc3b04a82bc81c2e63c8d4da0fdcf58d995322 +SHA512 (openjdk-shenandoah-jdk8u-aarch64-shenandoah-jdk8u322-b05-4curve.tar.xz) = 5026d6bd2e6d052fa88fb27d7d9fca2f50c5cc66ca3a9e52f8d3903ec4c738c0c815c20dfd5dfd44ab0ec48d264a36c67f35c302c1eee06a1b2277d842035221