packages/openjdk-11
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!389 sync master to openEuler-24.03-LTS-SP1

Browse Source 
From: @Autistic_boyya 
Reviewed-by: @kuenking111 
Signed-off-by: @kuenking111
This commit is contained in:
openeuler-ci-bot 2025-02-28 06:30:58 +00:00 committed by Gitee
commit 9bc5d41ed5
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
4 changed files with 13 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
Add-riscv64-support.patch
View File

@ -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],

2
G1-iterate-region-by-bitmap-rather-than-obj-size-in.patch
View File

@ -367,4 +367,4 @@ index 000000000..85b49171c
--- /dev/null
+++ b/version.txt
@@ -0,0 +1 @@
+11.0.25.0.13
+11.0.26.0.13

BIN
jdk-updates-jdk11u-jdk-11.0.25-ga.tar.xz → jdk-updates-jdk11u-jdk-11.0.26-ga.tar.xz
View File

Binary file not shown.

16
openjdk-11.spec
View File

@ -128,7 +128,7 @@
# New Version-String scheme-style defines
%global majorver 11
%global securityver 25
%global securityver 26
# buildjdkver is usually same as %%{majorver},
# but in time of bootstrap of next jdk, it is majorver-1,
# and this it is better to change it here, on single place
@ -149,12 +149,12 @@
%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
%global repo jdk11u
%global revision jdk-11.0.25-ga
%global revision jdk-11.0.26-ga
%global full_revision %{project}-%{repo}-%{revision}
# priority must be 7 digits in total
# setting to 1, so debug ones can have 0
@ -768,7 +768,7 @@ Provides: java-src%{?1} = %{epoch}:%{version}-%{release}
Name: java-%{javaver}-%{origin}
Version: %{newjavaver}.%{buildver}
Release: 4
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,6 +1715,12 @@ cjc.mainProgram(args) -- the returns from copy_jdk_configs.lua should not affect
%changelog
* Wed Feb 12 2025 Dingli Zhang <dingli@iscas.ac.cn> - 1:11.0.26.4-1
- update riscv64 port to 11.0.26
* Wed Jan 22 2025 Autistic_boyya <wangzhongyi7@huawei.com> - 1:11.0.26.4-0
- modified G1-iterate-region-by-bitmap-rather-than-obj-size-in.patch
* Fri Dec 27 2024 Dingli Zhang <dingli@iscas.ac.cn> - 1:11.0.25.9-4
- Fix build error on docker for riscv64
- Fix bogus date in changelog
@ -1740,7 +1746,7 @@ cjc.mainProgram(args) -- the returns from copy_jdk_configs.lua should not affect
* Thu Aug 1 2024 aoqi <aoqi@loongson.cn> - 1.11.0.24.8-5
- update LoongArch64 port to 11.0.24
* Mon Jul 29 2024 DXwangg <wangjiawei80@huawei.com> - 1.11.0.24.8-4
* Thu Jul 29 2024 DXwangg <wangjiawei80@huawei.com> - 1.11.0.24.8-4
- modified delete_expired_certificates.patch
* Thu Jul 25 2024 songliyang <songliyang@kylinos.cn> - 1.11.0.24.8-3