From e6756dced6306f859632db4a52d13ee938fb5fb1 Mon Sep 17 00:00:00 2001 From: Dingli Zhang Date: Wed, 12 Feb 2025 02:53:36 +0000 Subject: [PATCH] update riscv64 port to 11.0.26 --- Add-riscv64-support.patch | 100 +------------------------------------- openjdk-11.spec | 9 ++-- 2 files changed, 7 insertions(+), 102 deletions(-) diff --git a/Add-riscv64-support.patch b/Add-riscv64-support.patch index ef4c7b6..9c4b003 100644 --- a/Add-riscv64-support.patch +++ b/Add-riscv64-support.patch @@ -1,101 +1,3 @@ -diff --git a/.github/workflows/build-cross-compile.yml b/.github/workflows/build-cross-compile.yml -index 385b097b9f..b1c333f711 100644 ---- a/.github/workflows/build-cross-compile.yml -+++ b/.github/workflows/build-cross-compile.yml -@@ -54,28 +54,39 @@ jobs: - - arm - - s390x - - ppc64le -+ - riscv64 - include: - - target-cpu: aarch64 - gnu-arch: aarch64 - debian-arch: arm64 - debian-repository: https://httpredir.debian.org/debian/ - debian-version: bullseye -+ tolerate-sysroot-errors: false - - target-cpu: arm - gnu-arch: arm - debian-arch: armhf - debian-repository: https://httpredir.debian.org/debian/ - debian-version: bullseye -+ tolerate-sysroot-errors: false - gnu-abi: eabihf - - target-cpu: s390x - gnu-arch: s390x - debian-arch: s390x - debian-repository: https://httpredir.debian.org/debian/ - debian-version: bullseye -+ tolerate-sysroot-errors: false - - target-cpu: ppc64le - gnu-arch: powerpc64le - debian-arch: ppc64el - debian-repository: https://httpredir.debian.org/debian/ - debian-version: bullseye -+ tolerate-sysroot-errors: false -+ - target-cpu: riscv64 -+ gnu-arch: riscv64 -+ debian-arch: riscv64 -+ debian-repository: https://httpredir.debian.org/debian/ -+ debian-version: sid -+ tolerate-sysroot-errors: true - - steps: - - name: 'Checkout the JDK source' -@@ -113,6 +124,7 @@ jobs: - if: steps.get-cached-sysroot.outputs.cache-hit != 'true' - - - name: 'Create sysroot' -+ id: create-sysroot - run: > - sudo debootstrap - --arch=${{ matrix.debian-arch }} -@@ -123,6 +135,7 @@ jobs: - ${{ matrix.debian-version }} - sysroot - ${{ matrix.debian-repository }} -+ continue-on-error: ${{ matrix.tolerate-sysroot-errors }} - if: steps.get-cached-sysroot.outputs.cache-hit != 'true' - - - name: 'Prepare sysroot' -@@ -134,7 +147,12 @@ jobs: - rm -rf sysroot/usr/{sbin,bin,share} - rm -rf sysroot/usr/lib/{apt,gcc,udev,systemd} - rm -rf sysroot/usr/libexec/gcc -- if: steps.get-cached-sysroot.outputs.cache-hit != 'true' -+ if: steps.create-sysroot.outcome == 'success' && steps.get-cached-sysroot.outputs.cache-hit != 'true' -+ -+ - name: 'Remove broken sysroot' -+ run: | -+ sudo rm -rf sysroot/ -+ if: steps.create-sysroot.outcome != 'success' && steps.get-cached-sysroot.outputs.cache-hit != 'true' - - - name: 'Configure' - run: > -@@ -153,6 +171,7 @@ jobs: - echo "Dumping config.log:" && - cat config.log && - exit 1) -+ if: steps.create-sysroot.outcome == 'success' || steps.get-cached-sysroot.outputs.cache-hit == 'true' - - - name: 'Build' - id: build -@@ -160,3 +179,4 @@ jobs: - with: - make-target: 'hotspot ${{ inputs.make-arguments }}' - platform: linux-${{ matrix.target-cpu }} -+ if: steps.create-sysroot.outcome == 'success' || steps.get-cached-sysroot.outputs.cache-hit == 'true' -diff --git a/.jcheck/conf b/.jcheck/conf -index 5636278120..d13b1bf5e8 100644 ---- a/.jcheck/conf -+++ b/.jcheck/conf -@@ -1,5 +1,5 @@ - [general] --project=jdk-updates -+project=riscv-port - jbs=JDK - version=11.0.25 - diff --git a/make/autoconf/build-aux/config.sub b/make/autoconf/build-aux/config.sub index 3c280ac7c0..6c66c221e0 100644 --- a/make/autoconf/build-aux/config.sub @@ -123,7 +25,7 @@ index 3c280ac7c0..6c66c221e0 100644 if ! echo $* | grep '^aarch64-' >/dev/null ; then . $DIR/autoconf-config.sub "$@" diff --git a/make/autoconf/hotspot.m4 b/make/autoconf/hotspot.m4 -index 9bb34363e5..f84e8f84c6 100644 +index 2c52fd98c6..dbab814bc3 100644 --- a/make/autoconf/hotspot.m4 +++ b/make/autoconf/hotspot.m4 @@ -370,7 +370,8 @@ AC_DEFUN_ONCE([HOTSPOT_SETUP_JVM_FEATURES], diff --git a/openjdk-11.spec b/openjdk-11.spec index a028158..58a2fc1 100644 --- a/openjdk-11.spec +++ b/openjdk-11.spec @@ -149,7 +149,7 @@ %global origin_nice OpenJDK %global top_level_dir_name %{origin} %global minorver 0 -%global buildver 9 +%global buildver 4 %global patchver 0 %global project jdk-updates @@ -768,7 +768,7 @@ Provides: java-src%{?1} = %{epoch}:%{version}-%{release} Name: java-%{javaver}-%{origin} Version: %{newjavaver}.%{buildver} -Release: 0 +Release: 1 # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons # and this change was brought into RHEL-4. java-1.5.0-ibm packages # also included the epoch in their virtual provides. This created a @@ -1715,7 +1715,10 @@ cjc.mainProgram(args) -- the returns from copy_jdk_configs.lua should not affect %changelog -* Wed Jan 22 2025 Autistic_boyya - 1:11.0.26.9-0 +* Wed Feb 12 2025 Dingli Zhang - 1:11.0.26.4-1 +- update riscv64 port to 11.0.26 + +* Wed Jan 22 2025 Autistic_boyya - 1:11.0.26.4-0 - modified G1-iterate-region-by-bitmap-rather-than-obj-size-in.patch * Fri Dec 27 2024 Dingli Zhang - 1:11.0.25.9-4 -- Gitee