From ee08e04599f4eebc12db112f8e14deef95e5a372 Mon Sep 17 00:00:00 2001 From: Andrew Hughes Date: Mon, 17 Aug 2020 19:51:17 +0000 Subject: [PATCH] Update to aarch64-shenandoah-jdk8u272-b02. Remove JDK-8154313 backport now applied upstream. Change target from 'zip-docs' to 'docs-zip', which is the naming used upstream. --- .gitignore | 1 + java-1.8.0-openjdk.spec | 14 ++-- ...javadoc_scattered_all_over_the_place.patch | 68 ------------------- sources | 2 +- 4 files changed, 10 insertions(+), 75 deletions(-) delete mode 100644 jdk8154313-generated_javadoc_scattered_all_over_the_place.patch diff --git a/.gitignore b/.gitignore index df6ba2c..699143e 100644 --- a/.gitignore +++ b/.gitignore @@ -197,3 +197,4 @@ /aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u262-b10-4curve.tar.xz /aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u265-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 diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec index 5634043..718f1cb 100644 --- a/java-1.8.0-openjdk.spec +++ b/java-1.8.0-openjdk.spec @@ -115,7 +115,7 @@ %endif %global bootstrap_targets images -%global release_targets images zip-docs +%global release_targets images docs-zip # No docs nor bootcycle for debug builds %global debug_targets images @@ -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-b01 +%global shenandoah_revision aarch64-shenandoah-jdk8u272-b02 # 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, @@ -1327,8 +1327,6 @@ Patch107: s390-8214206_fix.patch # S8074839, PR2462: Resolve disabled warnings for libunpack and the unpack200 binary # This fixes printf warnings that lead to build failure with -Werror=format-security from optflags Patch502: pr2462-resolve_disabled_warnings_for_libunpack_and_the_unpack200_binary.patch -# S8154313: Generated javadoc scattered all over the place -Patch578: jdk8154313-generated_javadoc_scattered_all_over_the_place.patch # PR3591: Fix for bug 3533 doesn't add -mstackrealign to JDK code Patch571: jdk8199936-pr3591-enable_mstackrealign_on_x86_linux_as_well_as_x86_mac_os_x_jdk.patch # 8143245, PR3548: Zero build requires disabled warnings @@ -1714,7 +1712,6 @@ sh %{SOURCE12} %patch502 %patch504 %patch512 -%patch578 %patch523 %patch528 %patch529 @@ -2406,6 +2403,11 @@ require "copy_jdk_configs.lua" %endif %changelog +* Sun Aug 09 2020 Andrew Hughes - 1:1.8.0.272.b02-0.0.ea +- Update to aarch64-shenandoah-jdk8u272-b02. +- Remove JDK-8154313 backport now applied upstream. +- Change target from 'zip-docs' to 'docs-zip', which is the naming used upstream. + * Wed Aug 05 2020 Severin Gehwolf - 1:1.8.0.272.b01-0.1.ea - Fix vendor name to include '.': Red Hat, Inc => Red Hat, Inc. diff --git a/jdk8154313-generated_javadoc_scattered_all_over_the_place.patch b/jdk8154313-generated_javadoc_scattered_all_over_the_place.patch deleted file mode 100644 index 3a43c5f..0000000 --- a/jdk8154313-generated_javadoc_scattered_all_over_the_place.patch +++ /dev/null @@ -1,68 +0,0 @@ ---- jdk8/make/Javadoc.gmk 2016-04-01 16:53:41.069477682 +0200 -+++ jdk8/make/Javadoc.gmk 2016-04-01 16:53:41.014477059 +0200 -@@ -220,6 +220,12 @@ - JRE_API_DOCSDIR = $(DOCSDIR)/jre/api - PLATFORM_DOCSDIR = $(DOCSDIR)/platform - -+ -+JAVADOC_ARCHIVE_NAME := jdk-$(FULL_VERSION)-docs.zip -+JAVADOC_ARCHIVE_ASSEMBLY_DIR := $(DOCSTMPDIR)/zip-docs -+JAVADOC_ARCHIVE_DIR := $(OUTPUT_ROOT)/bundles -+JAVADOC_ARCHIVE := $(JAVADOC_ARCHIVE_DIR)/$(JAVADOC_ARCHIVE_NAME) -+ - # The non-core api javadocs need to be able to access the root of the core - # api directory, so for jdk/api or jre/api to get to the core api/ - # directory we would use this: -@@ -319,6 +325,37 @@ - all: docs - docs: coredocs otherdocs - -+# -+# Optional target which bundles all generated javadocs into a zip -+# archive. The dependency on docs is handled in Main.gmk. Incremental -+# building of docs is currently broken so if you invoke zip-docs after -+# docs, the docs are always rebuilt. -+# -+ -+zip-docs: $(JAVADOC_ARCHIVE) -+ -+# -+# Add the core docs as prerequisite to the archive to trigger a rebuild -+# if the core docs were rebuilt. Ideally any doc rebuild should trigger -+# this, but the way prerequisites are currently setup in this file, that -+# is hard to achieve. -+# -+ -+$(JAVADOC_ARCHIVE): $(COREAPI_INDEX_FILE) -+ @$(ECHO) "Compressing javadoc to single $(JAVADOC_ARCHIVE_NAME)" ; -+ $(MKDIR) -p $(JAVADOC_ARCHIVE_DIR) ; -+ $(RM) -r $(JAVADOC_ARCHIVE_ASSEMBLY_DIR) ; -+ $(MKDIR) -p $(JAVADOC_ARCHIVE_ASSEMBLY_DIR); -+ all_roots=`$(FIND) $(DOCSDIR) | $(GREP) index.html `; \ -+ pushd $(JAVADOC_ARCHIVE_ASSEMBLY_DIR); \ -+ for index_file in $${all_roots} ; do \ -+ target_dir=`dirname $${index_file}`; \ -+ name=`$(ECHO) $${target_dir} | $(SED) "s;/spec;;" | $(SED) "s;.*/;;"`; \ -+ $(LN) -s $${target_dir} $${name}; \ -+ done; \ -+ $(ZIP) -q -r $(JAVADOC_ARCHIVE) * ; \ -+ popd ; -+ - ################################################################# - # Production Targets -- USE THESE TARGETS WHEN: - # a) You're generating docs outside of release engineering's ---- jdk8/make/Main.gmk 2016-04-01 16:53:41.311480424 +0200 -+++ jdk8/make/Main.gmk 2016-04-01 16:53:41.266479914 +0200 -@@ -165,6 +165,12 @@ - @($(CD) $(SRC_ROOT)/make && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f Javadoc.gmk docs) - @$(call TargetExit) - -+zip-docs: docs zip-docs-only -+zip-docs-only: start-make -+ @$(call TargetEnter) -+ @($(CD) $(SRC_ROOT)/make && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f Javadoc.gmk zip-docs) -+ @$(call TargetExit) -+ - sign-jars: jdk sign-jars-only - sign-jars-only: start-make - @$(call TargetEnter) diff --git a/sources b/sources index 9eb8096..1632f9f 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-jdk8u272-b01-4curve.tar.xz) = aa4697511a892e08e7a0935b041809272a5e75ee4ac00c43c649807968e1858aaa83281df04c4d3f369fc8aa65ce72996d02bb46e3f38bd1a04716decd4556ea +SHA512 (aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u272-b02-4curve.tar.xz) = bd243bb11a6ae8361a7724029a5d89b73909a28c1f5233e3e4f5847f4957fbecb39b989a888ab3038aa438dab17e1e8502ccf0f9faa2da12d78046f5805159c6