From 6a8794519bf66d4e20a0183e01785534109520a7 Mon Sep 17 00:00:00 2001 From: Andrew Hughes Date: Mon, 22 Jun 2020 14:08:13 +0000 Subject: [PATCH] Update to aarch64-shenandoah-jdk8u262-b01. Switch to EA mode. Adjust JDK-8143245/PR3548 patch following context changes due to JDK-8203287 for JFR Adjust RH1648644 following context changes due to introduction of JFR packages Add jfr binary to devel package and alternatives set --- .gitignore | 1 + java-1.8.0-openjdk.spec | 13 +++++++-- ...ero_build_requires_disabled_warnings.patch | 2 +- ...va_access_bridge_privileged_security.patch | 29 ++++++++++--------- sources | 2 +- 5 files changed, 29 insertions(+), 18 deletions(-) diff --git a/.gitignore b/.gitignore index 4c205f8..f0d896d 100644 --- a/.gitignore +++ b/.gitignore @@ -181,3 +181,4 @@ /aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u252-b08.tar.xz /aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u252-b09-4curve.tar.xz /aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u252-b09.tar.xz +/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u262-b01-4curve.tar.xz diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec index 3754659..ca6a947 100644 --- a/java-1.8.0-openjdk.spec +++ b/java-1.8.0-openjdk.spec @@ -229,7 +229,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-jdk8u252-b09 +%global shenandoah_revision aarch64-shenandoah-jdk8u262-b01 # Define old aarch64/jdk8u tree variables for compatibility %global project %{shenandoah_project} %global repo %{shenandoah_repo} @@ -250,7 +250,7 @@ # Release will be (where N is usually a number starting at 1): # - 0.N%%{?extraver}%%{?dist} for EA releases, # - N%%{?extraver}{?dist} for GA releases -%global is_ga 1 +%global is_ga 0 %if %{is_ga} %global milestone fcs %global milestone_version %{nil} @@ -434,6 +434,7 @@ alternatives \\ --slave %{_bindir}/jconsole jconsole %{sdkbindir -- %{?1}}/jconsole \\ --slave %{_bindir}/jdb jdb %{sdkbindir -- %{?1}}/jdb \\ --slave %{_bindir}/jdeps jdeps %{sdkbindir -- %{?1}}/jdeps \\ + --slave %{_bindir}/jfr jfr %{sdkbindir -- %{?1}}/jfr \\ --slave %{_bindir}/jhat jhat %{sdkbindir -- %{?1}}/jhat \\ --slave %{_bindir}/jinfo jinfo %{sdkbindir -- %{?1}}/jinfo \\ --slave %{_bindir}/jmap jmap %{sdkbindir -- %{?1}}/jmap \\ @@ -765,6 +766,7 @@ exit 0 %{_jvmdir}/%{sdkdir -- %{?1}}/bin/jconsole %{_jvmdir}/%{sdkdir -- %{?1}}/bin/jdb %{_jvmdir}/%{sdkdir -- %{?1}}/bin/jdeps +%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jfr %{_jvmdir}/%{sdkdir -- %{?1}}/bin/jhat %{_jvmdir}/%{sdkdir -- %{?1}}/bin/jinfo %{_jvmdir}/%{sdkdir -- %{?1}}/bin/jjs @@ -2238,6 +2240,13 @@ require "copy_jdk_configs.lua" %endif %changelog +* Mon Jun 22 2020 Andrew Hughes - 1:1.8.0.262.b01-0.0.ea +- Update to aarch64-shenandoah-jdk8u262-b01. +- Switch to EA mode. +- Adjust JDK-8143245/PR3548 patch following context changes due to JDK-8203287 for JFR +- Adjust RH1648644 following context changes due to introduction of JFR packages +- Add jfr binary to devel package and alternatives set + * Thu Jun 18 2020 Andrew Hughes - 1:1.8.0.252.b09-1 - Add release notes. diff --git a/jdk8143245-pr3548-zero_build_requires_disabled_warnings.patch b/jdk8143245-pr3548-zero_build_requires_disabled_warnings.patch index 298bbd3..98d3903 100644 --- a/jdk8143245-pr3548-zero_build_requires_disabled_warnings.patch +++ b/jdk8143245-pr3548-zero_build_requires_disabled_warnings.patch @@ -145,4 +145,4 @@ diff --git openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp o + return false; // silence compile warning } - // These routines are only used on cpu architectures that + bool pd_get_top_frame_for_profiling(frame* fr_addr, diff --git a/rh1648644-java_access_bridge_privileged_security.patch b/rh1648644-java_access_bridge_privileged_security.patch index 538468a..28060ed 100644 --- a/rh1648644-java_access_bridge_privileged_security.patch +++ b/rh1648644-java_access_bridge_privileged_security.patch @@ -1,22 +1,23 @@ ---- jdk8/jdk/src/share/lib/security/java.security-linux.orig -+++ jdk8/jdk/src/share/lib/security/java.security-linux -@@ -223,7 +223,9 @@ - jdk.nashorn.internal.,\ - jdk.nashorn.tools.,\ - jdk.xml.internal.,\ -- com.sun.activation.registries. -+ com.sun.activation.registries.,\ +diff --git openjdk.orig/jdk/src/share/lib/security/java.security-linux openjdk/jdk/src/share/lib/security/java.security-linux +--- openjdk.orig/jdk/src/share/lib/security/java.security-linux ++++ openjdk/jdk/src/share/lib/security/java.security-linux +@@ -226,7 +226,9 @@ + com.sun.activation.registries.,\ + jdk.jfr.events.,\ + jdk.jfr.internal.,\ +- jdk.management.jfr.internal. ++ jdk.management.jfr.internal.,\ + org.GNOME.Accessibility.,\ + org.GNOME.Bonobo. # # List of comma-separated packages that start with or equal this string -@@ -273,7 +275,9 @@ - jdk.nashorn.internal.,\ - jdk.nashorn.tools.,\ - jdk.xml.internal.,\ -- com.sun.activation.registries. -+ com.sun.activation.registries.,\ +@@ -279,7 +281,9 @@ + com.sun.activation.registries.,\ + jdk.jfr.events.,\ + jdk.jfr.internal.,\ +- jdk.management.jfr.internal. ++ jdk.management.jfr.internal.,\ + org.GNOME.Accessibility.,\ + org.GNOME.Bonobo. diff --git a/sources b/sources index 441c7ba..3827fa0 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-jdk8u252-b09-4curve.tar.xz) = d64e8961a1aa95e70ebe82eb3d894a9638b5f9d5e8674e4cbc35658658e7b7864b73fdf0ebaed7e7cc8b74a3419137e8f7483f10f9e3d34396c99c889bf3de74 +SHA512 (aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u262-b01-4curve.tar.xz) = ef4516ba83f77161e7c6ef3d4b02cdadca5fef41086520f41bde93d10f4ca09f0511e753c56ecd8775deedd8fe46c3a8efb9939e9005ccc04304779c804ad8c3