NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/openjdk{-bin}: drop OpenJDK11 and add OpenJDK21

Browse Source 
OpenJDK 21 is out and with it, OpenJDK11 is now EOL.
See: https://endoflife.date/oracle-jdk As such, drop support for 11 and do the
following:

  - The 0001-Add-ARCv2-ISA-processors-support-to-Zero.patch patch now applies to
    both 17 and 21. Move it out of the version-specific directoriy.

  - BR2_OPENJDK_VERSION_LTS is now set to 17.

  - BR2_OPENJDK_VERSION_LATEST is now set to 21.

  - Drop --disable-hotspot-gtest as it has been removed, and was ignored in 17.

  - Add two separate HOST_OPENJDK_BIN_VERSION defines in openjdk-bin.mk as
    there is not a point release yet for OpenJDK 21.

  - Update the expectedVersion variable in JniTest.java from 0x000A0000 to
    0x00150000

Tested with:
./support/testing/run-tests tests.package.test_openjdk.TestOpenJdk.test_run

Signed-off-by: Adam Duskett <adam.duskett@amarulasolutions.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Adam Duskett 2023-10-17 19:36:11 +02:00 committed by Thomas Petazzoni
parent 547552a9cb
commit 095cab35a9
9 changed files with 33 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.checkpackageignore
View File

@ -1005,7 +1005,7 @@ package/olsr/S50olsr Indent Shellcheck Variables
package/omxplayer/0001-Update-Makefile-to-be-compatible-with-buildroot.patch Upstream
package/open-plc-utils/0001-Remove-OWNER-and-GROUPS-parameters-to-install.patch Upstream
package/open2300/0001-fix-makefile.patch Upstream
package/openjdk/17.0.8.1+1/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch Upstream
package/openjdk/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch Upstream
package/openldap/0001-fix_cross_strip.patch Upstream
package/openldap/0002-fix-bignum.patch Upstream
package/openldap/0003-disable-docs.patch Upstream

7
Config.in.legacy
View File

@ -146,6 +146,13 @@ endif
comment "Legacy options removed in 2023.11"
config BR2_PACKAGE_OPENJDK_VERSION_11
bool "openjdk 11 has been removed"
select BR2_LEGACY
help
Version 11 of OpenJDK is no longer supported, version 17
should now be used as the new LTS release.
config BR2_KERNEL_HEADERS_6_4
bool "kernel headers version 6.4.x are no longer supported"
select BR2_LEGACY

8
package/openjdk-bin/openjdk-bin.hash
View File

@ -1,11 +1,11 @@
# From https://github.com/adoptium/temurin21-binaries/releases
sha256 82f64c53acaa045370d6762ebd7441b74e6fda14b464d54d1ff8ca941ec069e6 OpenJDK21U-jdk_x64_linux_hotspot_21_35.tar.gz
sha256 33e440c237438aa2e3866d84ead8d4e00dc0992d98d9fd0ee2fe48192f2dbc4b OpenJDK21U-jdk_aarch64_linux_hotspot_21_35.tar.gz
# https://github.com/adoptium/temurin17-binaries/releases
sha256 c25dfbc334068a48c19c44ce39ad4b8427e309ae1cfa83f23c102e78b8a6dcc0 OpenJDK17U-jdk_x64_linux_hotspot_17.0.8.1_1.tar.gz
sha256 eefd3cf3b3dd47ff269fa5b5c10b5e096b163f4e9c1810023abdbc00dc6cc304 OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.8.1_1.tar.gz
# From https://github.com/adoptium/temurin11-binaries/releases
sha256 7a99258af2e3ee9047e90f1c0c1775fd6285085759501295358d934d662e01f9 OpenJDK11U-jdk_x64_linux_hotspot_11.0.20_8.tar.gz
sha256 eb821c049c2d2f7c3fbf8ddcce2d608d3aa7d488700e76bfbbebabba93021748 OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.20_8.tar.gz
# Locally calculated
sha256 4b9abebc4338048a7c2dc184e9f800deb349366bdf28eb23c2677a77b4c87726 legal/java.prefs/LICENSE
sha256 a44eb7b5caf5534c6ef536b21edb40b4d6babf91bf97d9d45596868618b2c6fb legal/java.prefs/ASSEMBLY_EXCEPTION

11
package/openjdk-bin/openjdk-bin.mk
View File

@ -4,12 +4,14 @@
#
################################################################################
ifeq ($(BR2_PACKAGE_OPENJDK_VERSION_17),y)
ifeq ($(BR2_PACKAGE_OPENJDK_VERSION_21),y)
HOST_OPENJDK_BIN_VERSION_MAJOR = 21
HOST_OPENJDK_BIN_VERSION_MINOR = 35
HOST_OPENJDK_BIN_VERSION = $(HOST_OPENJDK_BIN_VERSION_MAJOR)_$(HOST_OPENJDK_BIN_VERSION_MINOR)
else
HOST_OPENJDK_BIN_VERSION_MAJOR = 17
HOST_OPENJDK_BIN_VERSION_MINOR = 0.8.1_1
else
HOST_OPENJDK_BIN_VERSION_MAJOR = 11
HOST_OPENJDK_BIN_VERSION_MINOR = 0.20_8
HOST_OPENJDK_BIN_VERSION = $(HOST_OPENJDK_BIN_VERSION_MAJOR).$(HOST_OPENJDK_BIN_VERSION_MINOR)
endif
ifeq ($(HOSTARCH),x86_64)
@ -19,7 +21,6 @@ ifeq ($(HOSTARCH),aarch64)
HOST_OPENJDK_BIN_DOWNLOAD_ARCH_NAME = aarch64
endif
HOST_OPENJDK_BIN_VERSION = $(HOST_OPENJDK_BIN_VERSION_MAJOR).$(HOST_OPENJDK_BIN_VERSION_MINOR)
HOST_OPENJDK_BIN_SOURCE = OpenJDK$(HOST_OPENJDK_BIN_VERSION_MAJOR)U-jdk_$(HOST_OPENJDK_BIN_DOWNLOAD_ARCH_NAME)_linux_hotspot_$(HOST_OPENJDK_BIN_VERSION).tar.gz
HOST_OPENJDK_BIN_SITE = https://github.com/adoptium/temurin$(HOST_OPENJDK_BIN_VERSION_MAJOR)-binaries/releases/download/jdk-$(subst _,%2B,$(HOST_OPENJDK_BIN_VERSION))

0
package/openjdk/17.0.8.1+1/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch → package/openjdk/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch
View File

14
package/openjdk/Config.in
View File

@ -57,20 +57,18 @@ if BR2_PACKAGE_OPENJDK
choice
prompt "openjdk version"
default BR2_PACKAGE_OPENJDK_VERSION_11 if BR2_OPENJDK_VERSION_LTS # legacy
default BR2_PACKAGE_OPENJDK_VERSION_17 if BR2_OPENJDK_VERSION_LATEST # legacy
default BR2_PACKAGE_OPENJDK_VERSION_17
default BR2_PACKAGE_OPENJDK_VERSION_17 if BR2_OPENJDK_VERSION_LTS # legacy
default BR2_PACKAGE_OPENJDK_VERSION_21 if BR2_OPENJDK_VERSION_LATEST # legacy
default BR2_PACKAGE_OPENJDK_VERSION_21
help
Select the version of OpenJDK you wish to use.
config BR2_PACKAGE_OPENJDK_VERSION_11
bool "OpenJDK 11"
# The ARC-specific OpenJDK patch only applies to OpenJDK 17.
depends on !BR2_arc
config BR2_PACKAGE_OPENJDK_VERSION_17
bool "OpenJDK 17"
config BR2_PACKAGE_OPENJDK_VERSION_21
bool "OpenJDK 21"
endchoice
config BR2_PACKAGE_OPENJDK_FULL_JDK

2
package/openjdk/openjdk.hash
View File

@ -1,4 +1,4 @@
# Locally computed
sha256 b798ebc2e899a98edf2be99e786bb0fbad144e2270925dffe624fbe052f07ade openjdk-21+35.tar.gz
sha256 e57251d8306911282b6f0a2f721431dab5f87c99cce0930fc062e690f7c77f04 openjdk-17.0.8.1+1.tar.gz
sha256 b2a37ef209ae7eaf8f34182b7c9aa3252af20a214d02970f96ce62242c805479 openjdk-11.0.20+8.tar.gz
sha256 4b9abebc4338048a7c2dc184e9f800deb349366bdf28eb23c2677a77b4c87726 LICENSE

13
package/openjdk/openjdk.mk
View File

@ -4,14 +4,16 @@
#
################################################################################
ifeq ($(BR2_PACKAGE_OPENJDK_VERSION_17),y)
ifeq ($(BR2_PACKAGE_OPENJDK_VERSION_21),y)
OPENJDK_VERSION_MAJOR = 21
OPENJDK_VERSION_MINOR = 35
OPENJDK_VERSION = $(OPENJDK_VERSION_MAJOR)+$(OPENJDK_VERSION_MINOR)
else
OPENJDK_VERSION_MAJOR = 17
OPENJDK_VERSION_MINOR = 0.8.1+1
else
OPENJDK_VERSION_MAJOR = 11
OPENJDK_VERSION_MINOR = 0.20+8
endif
OPENJDK_VERSION = $(OPENJDK_VERSION_MAJOR).$(OPENJDK_VERSION_MINOR)
endif
OPENJDK_SITE = $(call github,openjdk,jdk$(OPENJDK_VERSION_MAJOR)u,jdk-$(OPENJDK_VERSION))
OPENJDK_LICENSE = GPL-2.0+ with exception
@ -83,7 +85,6 @@ OPENJDK_CONF_ENV = \
OPENJDK_CONF_OPTS = \
--disable-full-docs \
--disable-hotspot-gtest \
--disable-manpages \
--disable-warnings-as-errors \
--enable-headless-only \

2
support/testing/tests/package/br2-external/openjdk/package/openjdk-jni-test/JniTest.java
View File

@ -33,7 +33,7 @@ public class JniTest
public static void main(String[] args)
{
var actualVersion = JniWrapper.get_jni_version();
var expectedVersion = 0x000A0000;
var expectedVersion = 0x00150000;
JniTest.Test(
"Get JNI Version",
actualVersion,