package/{openjdk, openjdk-bin}: bump version to 14.0.1+7
PATCH 1/2 package/{openjdk, openjdk-bin}: bump version to 14.0.1+7
From: Adam Duskett <[email protected]>
--- package/openjdk-bin/openjdk-bin.hash | 8 ++++---- package/openjdk-bin/openjdk-bin.mk | 4 ++-- package/openjdk/openjdk.hash | 4 ++-- package/openjdk/openjdk.mk | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-)
package/openjdk-bin/openjdk-bin.hash +4 -4
@@ -1,6 +1,6 @@ -# From https://github.com/AdoptOpenJDK/openjdk12-binaries/releases -sha256 6c06853332585ab58834d9e8a02774b388e6e062ef6c4084b4f058c67f2e81b5 OpenJDK14U-jdk_x64_linux_hotspot_14_36.tar.gz +# From https://github.com/AdoptOpenJDK/openjdk14-binaries/releases +sha256 9ddf9b35996fbd784a53fff3e0d59920a7d5acf1a82d4c8d70906957ac146cd1 OpenJDK14U-jdk_x64_linux_hotspot_14.0.1_7.tar.gz # Locally calculated -sha256 4b9abebc4338048a7c2dc184e9f800deb349366bdf28eb23c2677a77b4c87726 legal/java.prefs/LICENSE -sha256 a44eb7b5caf5534c6ef536b21edb40b4d6babf91bf97d9d45596868618b2c6fb legal/java.prefs/ASSEMBLY_EXCEPTION +sha256 4b9abebc4338048a7c2dc184e9f800deb349366bdf28eb23c2677a77b4c87726 legal/java.prefs/LICENSE +sha256 a44eb7b5caf5534c6ef536b21edb40b4d6babf91bf97d9d45596868618b2c6fb legal/java.prefs/ASSEMBLY_EXCEPTION
package/openjdk-bin/openjdk-bin.mk +2 -2
@@ -4,8 +4,8 @@ # ################################################################################ -HOST_OPENJDK_BIN_VERSION_MAJOR = 14 -HOST_OPENJDK_BIN_VERSION_MINOR = 36 +HOST_OPENJDK_BIN_VERSION_MAJOR = 14.0.1 +HOST_OPENJDK_BIN_VERSION_MINOR = 7 HOST_OPENJDK_BIN_VERSION = $(HOST_OPENJDK_BIN_VERSION_MAJOR)_$(HOST_OPENJDK_BIN_VERSION_MINOR) HOST_OPENJDK_BIN_SOURCE = OpenJDK14U-jdk_x64_linux_hotspot_$(HOST_OPENJDK_BIN_VERSION).tar.gz HOST_OPENJDK_BIN_SITE = https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-$(HOST_OPENJDK_BIN_VERSION_MAJOR)%2B$(HOST_OPENJDK_BIN_VERSION_MINOR)
package/openjdk/openjdk.hash +2 -2
@@ -1,3 +1,3 @@ # Locally computed -sha256 6815dbac7dd0f86291254e84ed17565c89477eeb6b0847a9648b00ecb4f07634 jdk-14+36.tar.gz -sha256 4b9abebc4338048a7c2dc184e9f800deb349366bdf28eb23c2677a77b4c87726 LICENSE +sha256 301203cbda9c40a5fc496b3299806995ac4833b39c6d2e8470fd85a35461afd4 jdk-14.0.1+7.tar.gz +sha256 4b9abebc4338048a7c2dc184e9f800deb349366bdf28eb23c2677a77b4c87726 LICENSE
package/openjdk/openjdk.mk +2 -2
@@ -4,8 +4,8 @@ # ################################################################################ -OPENJDK_VERSION_MAJOR = 14 -OPENJDK_VERSION_MINOR = 36 +OPENJDK_VERSION_MAJOR = 14.0.1 +OPENJDK_VERSION_MINOR = 7 OPENJDK_VERSION = $(OPENJDK_VERSION_MAJOR)+$(OPENJDK_VERSION_MINOR) OPENJDK_SOURCE = jdk-$(OPENJDK_VERSION).tar.gz OPENJDK_SITE = https://hg.openjdk.java.net/jdk-updates/jdk14u/archive
Signature · 1 line
2.25.3
PATCH 2/2 package/{openjdk, openjdk-bin}: add support for building either lts or latest
From: Adam Duskett <[email protected]>
As Java is used quite a bit in the enterprise world, having the option to build the LTS version of OpenJDK is quite convenient and also a requirement for many companies wanting to use Java.
As such, there are three options:
1) Continue only to support the latest version of OpenJDK.
2) Downgrade our existing OpenJDK package from 14 to 11.
3) Add an option to support either OpenJDK 11 or 14.
OpenJDK 11 and 14 currently have:
- The same configure options.
- The same license files and hashes for those license files.
- The same dependencies.
- The same method to build and install.
As such, supporting both 11 and 14 is not only an easy option to add to Buildroot, but also a nice feature for users who wish to use Java in an embedded environment with a company that mandates the use of the LTS version.
--- package/openjdk-bin/openjdk-bin.hash | 3 +++ package/openjdk-bin/openjdk-bin.mk | 8 ++++++++ package/openjdk/Config.in | 14 ++++++++++++++ package/openjdk/openjdk.hash | 1 + package/openjdk/openjdk.mk | 9 +++++++++ 5 files changed, 35 insertions(+)
package/openjdk-bin/openjdk-bin.hash +3 -0
@@ -1,6 +1,9 @@ # From https://github.com/AdoptOpenJDK/openjdk14-binaries/releases sha256 9ddf9b35996fbd784a53fff3e0d59920a7d5acf1a82d4c8d70906957ac146cd1 OpenJDK14U-jdk_x64_linux_hotspot_14.0.1_7.tar.gz +# From https://github.com/AdoptOpenJDK/openjdk11-binaries/releases +sha256 ee60304d782c9d5654bf1a6b3f38c683921c1711045e1db94525a51b7024a2ca OpenJDK11U-jdk_x64_linux_hotspot_11.0.7_10.tar.gz + # Locally calculated sha256 4b9abebc4338048a7c2dc184e9f800deb349366bdf28eb23c2677a77b4c87726 legal/java.prefs/LICENSE sha256 a44eb7b5caf5534c6ef536b21edb40b4d6babf91bf97d9d45596868618b2c6fb legal/java.prefs/ASSEMBLY_EXCEPTION
package/openjdk-bin/openjdk-bin.mk +8 -0
@@ -4,11 +4,19 @@ # ################################################################################ +ifeq ($(BR2_OPENJDK_VERSION_11_X),y) +HOST_OPENJDK_BIN_VERSION_MAJOR = 11.0.7 +HOST_OPENJDK_BIN_VERSION_MINOR = 10 +HOST_OPENJDK_BIN_VERSION = $(HOST_OPENJDK_BIN_VERSION_MAJOR)_$(HOST_OPENJDK_BIN_VERSION_MINOR) +HOST_OPENJDK_BIN_SOURCE = OpenJDK11U-jdk_x64_linux_hotspot_$(HOST_OPENJDK_BIN_VERSION).tar.gz +HOST_OPENJDK_BIN_SITE = https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-$(HOST_OPENJDK_BIN_VERSION_MAJOR)%2B$(HOST_OPENJDK_BIN_VERSION_MINOR) +else HOST_OPENJDK_BIN_VERSION_MAJOR = 14.0.1 HOST_OPENJDK_BIN_VERSION_MINOR = 7 HOST_OPENJDK_BIN_VERSION = $(HOST_OPENJDK_BIN_VERSION_MAJOR)_$(HOST_OPENJDK_BIN_VERSION_MINOR) HOST_OPENJDK_BIN_SOURCE = OpenJDK14U-jdk_x64_linux_hotspot_$(HOST_OPENJDK_BIN_VERSION).tar.gz HOST_OPENJDK_BIN_SITE = https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-$(HOST_OPENJDK_BIN_VERSION_MAJOR)%2B$(HOST_OPENJDK_BIN_VERSION_MINOR) +endif HOST_OPENJDK_BIN_LICENSE = GPL-2.0+ with exception HOST_OPENJDK_BIN_LICENSE_FILES = legal/java.prefs/LICENSE legal/java.prefs/ASSEMBLY_EXCEPTION
package/openjdk/Config.in +14 -0
@@ -49,6 +49,20 @@ config BR2_PACKAGE_OPENJDK if BR2_PACKAGE_OPENJDK +choice + prompt "openjdk version" + default BR2_OPENJDK_VERSION_11_X + help + Select the version of OpenJDK you wish to use. + +config BR2_OPENJDK_VERSION_11_X + bool "OpenJDK 11 (LTS)" + +config BR2_OPENJDK_VERSION_14_X + bool "OpenJDK 14 (Latest)" + +endchoice + choice prompt "openjdk variant" default BR2_PACKAGE_OPENJDK_JVM_VARIANT_SERVER if !BR2_powerpc
package/openjdk/openjdk.hash +1 -0
@@ -1,3 +1,4 @@ # Locally computed sha256 301203cbda9c40a5fc496b3299806995ac4833b39c6d2e8470fd85a35461afd4 jdk-14.0.1+7.tar.gz +sha256 d105471d06568e4659c21518d1bf42b8ebab5c70539e9777d570549a98ed2a8a jdk-11.0.7+10.tar.gz sha256 4b9abebc4338048a7c2dc184e9f800deb349366bdf28eb23c2677a77b4c87726 LICENSE
package/openjdk/openjdk.mk +9 -0
@@ -4,11 +4,20 @@ # ################################################################################ +ifeq ($(BR2_OPENJDK_VERSION_11_X),y) +OPENJDK_VERSION_MAJOR = 11.0.7 +OPENJDK_VERSION_MINOR = 10 +OPENJDK_VERSION = $(OPENJDK_VERSION_MAJOR)+$(OPENJDK_VERSION_MINOR) +OPENJDK_SOURCE = jdk-$(OPENJDK_VERSION).tar.gz +OPENJDK_SITE = https://hg.openjdk.java.net/jdk-updates/jdk11u/archive +else OPENJDK_VERSION_MAJOR = 14.0.1 OPENJDK_VERSION_MINOR = 7 OPENJDK_VERSION = $(OPENJDK_VERSION_MAJOR)+$(OPENJDK_VERSION_MINOR) OPENJDK_SOURCE = jdk-$(OPENJDK_VERSION).tar.gz OPENJDK_SITE = https://hg.openjdk.java.net/jdk-updates/jdk14u/archive +endif + OPENJDK_LICENSE = GPL-2.0+ with exception OPENJDK_LICENSE_FILES = LICENSE
Signature · 1 line
2.25.3
PATCH 2/2 package/{openjdk, openjdk-bin}: add support for building either lts or latest
Adam, All,
On 2020-04-22 12:21 -0700, aduskett at gmail.com spake thusly:
Quoted 10 lines
From: Adam Duskett <[email protected]>
As Java is used quite a bit in the enterprise world, having the option to build the LTS version of OpenJDK is quite convenient and also a requirement for many companies wanting to use Java.
As such, there are three options:
1) Continue only to support the latest version of OpenJDK.
2) Downgrade our existing OpenJDK package from 14 to 11.
3) Add an option to support either OpenJDK 11 or 14.
We recently dropped such a choice from another major package, qt5, whwere we decided to only support the latest version, like we do for basically all userland programs (with very little exceptions).
Adding back such a choice in another package does not got with this trend, though...
So I'm deferring the decision for now untill there is more fedback than just "but this is LTS" and "but we need the latest".
Note: the diff itself is not a problem, it loks sane enough. The problem really is the choice.
Regards,
Yann E. MORIN.
Quoted 123 lines
OpenJDK 11 and 14 currently have:
- The same configure options.
- The same license files and hashes for those license files.
- The same dependencies.
- The same method to build and install.As such, supporting both 11 and 14 is not only an easy option to add to Buildroot, but also a nice feature for users who wish to use Java in an embedded environment with a company that mandates the use of the LTS version.
Signed-off-by Adam Duskett <[email protected]>--- package/openjdk-bin/openjdk-bin.hash | 3 +++ package/openjdk-bin/openjdk-bin.mk | 8 ++++++++ package/openjdk/Config.in | 14 ++++++++++++++ package/openjdk/openjdk.hash | 1 + package/openjdk/openjdk.mk | 9 +++++++++ 5 files changed, 35 insertions(+)package/openjdk-bin/openjdk-bin.hash +3
-0@@ -1,6 +1,9 @@ # From https://github.com/AdoptOpenJDK/openjdk14-binaries/releases sha256 9ddf9b35996fbd784a53fff3e0d59920a7d5acf1a82d4c8d70906957ac146cd1 OpenJDK14U-jdk_x64_linux_hotspot_14.0.1_7.tar.gz +# From https://github.com/AdoptOpenJDK/openjdk11-binaries/releases +sha256 ee60304d782c9d5654bf1a6b3f38c683921c1711045e1db94525a51b7024a2ca OpenJDK11U-jdk_x64_linux_hotspot_11.0.7_10.tar.gz + # Locally calculated sha256 4b9abebc4338048a7c2dc184e9f800deb349366bdf28eb23c2677a77b4c87726 legal/java.prefs/LICENSE sha256 a44eb7b5caf5534c6ef536b21edb40b4d6babf91bf97d9d45596868618b2c6fb legal/java.prefs/ASSEMBLY_EXCEPTIONpackage/openjdk-bin/openjdk-bin.mk +8
-0@@ -4,11 +4,19 @@ # ################################################################################ +ifeq ($(BR2_OPENJDK_VERSION_11_X),y) +HOST_OPENJDK_BIN_VERSION_MAJOR = 11.0.7 +HOST_OPENJDK_BIN_VERSION_MINOR = 10 +HOST_OPENJDK_BIN_VERSION = $(HOST_OPENJDK_BIN_VERSION_MAJOR)_$(HOST_OPENJDK_BIN_VERSION_MINOR) +HOST_OPENJDK_BIN_SOURCE = OpenJDK11U-jdk_x64_linux_hotspot_$(HOST_OPENJDK_BIN_VERSION).tar.gz +HOST_OPENJDK_BIN_SITE = https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-$(HOST_OPENJDK_BIN_VERSION_MAJOR)%2B$(HOST_OPENJDK_BIN_VERSION_MINOR) +else HOST_OPENJDK_BIN_VERSION_MAJOR = 14.0.1 HOST_OPENJDK_BIN_VERSION_MINOR = 7 HOST_OPENJDK_BIN_VERSION = $(HOST_OPENJDK_BIN_VERSION_MAJOR)_$(HOST_OPENJDK_BIN_VERSION_MINOR) HOST_OPENJDK_BIN_SOURCE = OpenJDK14U-jdk_x64_linux_hotspot_$(HOST_OPENJDK_BIN_VERSION).tar.gz HOST_OPENJDK_BIN_SITE = https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-$(HOST_OPENJDK_BIN_VERSION_MAJOR)%2B$(HOST_OPENJDK_BIN_VERSION_MINOR) +endif HOST_OPENJDK_BIN_LICENSE = GPL-2.0+ with exception HOST_OPENJDK_BIN_LICENSE_FILES = legal/java.prefs/LICENSE legal/java.prefs/ASSEMBLY_EXCEPTIONpackage/openjdk/Config.in +14
-0@@ -49,6 +49,20 @@ config BR2_PACKAGE_OPENJDK if BR2_PACKAGE_OPENJDK +choice + prompt "openjdk version" + default BR2_OPENJDK_VERSION_11_X + help + Select the version of OpenJDK you wish to use. + +config BR2_OPENJDK_VERSION_11_X + bool "OpenJDK 11 (LTS)" + +config BR2_OPENJDK_VERSION_14_X + bool "OpenJDK 14 (Latest)" + +endchoice + choice prompt "openjdk variant" default BR2_PACKAGE_OPENJDK_JVM_VARIANT_SERVER if !BR2_powerpcpackage/openjdk/openjdk.hash +1
-0@@ -1,3 +1,4 @@ # Locally computed sha256 301203cbda9c40a5fc496b3299806995ac4833b39c6d2e8470fd85a35461afd4 jdk-14.0.1+7.tar.gz +sha256 d105471d06568e4659c21518d1bf42b8ebab5c70539e9777d570549a98ed2a8a jdk-11.0.7+10.tar.gz sha256 4b9abebc4338048a7c2dc184e9f800deb349366bdf28eb23c2677a77b4c87726 LICENSEpackage/openjdk/openjdk.mk +9
-0@@ -4,11 +4,20 @@ # ################################################################################ +ifeq ($(BR2_OPENJDK_VERSION_11_X),y) +OPENJDK_VERSION_MAJOR = 11.0.7 +OPENJDK_VERSION_MINOR = 10 +OPENJDK_VERSION = $(OPENJDK_VERSION_MAJOR)+$(OPENJDK_VERSION_MINOR) +OPENJDK_SOURCE = jdk-$(OPENJDK_VERSION).tar.gz +OPENJDK_SITE = https://hg.openjdk.java.net/jdk-updates/jdk11u/archive +else OPENJDK_VERSION_MAJOR = 14.0.1 OPENJDK_VERSION_MINOR = 7 OPENJDK_VERSION = $(OPENJDK_VERSION_MAJOR)+$(OPENJDK_VERSION_MINOR) OPENJDK_SOURCE = jdk-$(OPENJDK_VERSION).tar.gz OPENJDK_SITE = https://hg.openjdk.java.net/jdk-updates/jdk14u/archive +endif + OPENJDK_LICENSE = GPL-2.0+ with exception OPENJDK_LICENSE_FILES = LICENSESignature · 6 lines
2.25.3 _______________________________________________ buildroot mailing list buildroot at busybox.net http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
PATCH 2/2 package/{openjdk, openjdk-bin}: add support for building either lts or latest
Hello;
Quoted 10 lines · Yann E. MORIN
Adam, All,
On 2020-04-22 12:21 -0700, aduskett at gmail.com spake thusly:
Quoted 6 lines
From: Adam Duskett <[email protected]>
As Java is used quite a bit in the enterprise world, having the option to build the LTS version of OpenJDK is quite convenient and also a requirement for many companies wanting to use Java.
Quoted 9 lines
Quoted 4 lines
As such, there are three options:
1) Continue only to support the latest version of OpenJDK.
2) Downgrade our existing OpenJDK package from 14 to 11.
3) Add an option to support either OpenJDK 11 or 14.We recently dropped such a choice from another major package, qt5, where we decided to only support the latest version as we do for basically all userland programs (with very little exceptions).
What I found in the logs about QT5 support is the following:
"As discussed during the FOSDEM2019 develop days, Qt 5.6 is very old (5.6.3 was released in September 2017, and 5.6.x became EOL in March 2019), so drop it before the new Buildroot LTS release:"
So it seems like QT5.6 support was dropped not because of the two versions, but because 5.6 was being EOLed and was quite old.
Just a thought.
Adam
Quoted 143 lines
Adding back such a choice in another package does not got with this trend, though...
So I'm deferring the decision for now untill there is more fedback than just "but this is LTS" and "but we need the latest".
Note: the diff itself is not a problem, it loks sane enough. The problem really is the choice.
Regards,
Yann E. MORIN.Quoted 119 lines
OpenJDK 11 and 14 currently have:
- The same configure options.
- The same license files and hashes for those license files.
- The same dependencies.
- The same method to build and install.As such, supporting both 11 and 14 is not only an easy option to add to Buildroot, but also a nice feature for users who wish to use Java in an embedded environment with a company that mandates the use of the LTS version.
Signed-off-by Adam Duskett <[email protected]>--- package/openjdk-bin/openjdk-bin.hash | 3 +++ package/openjdk-bin/openjdk-bin.mk | 8 ++++++++ package/openjdk/Config.in | 14 ++++++++++++++ package/openjdk/openjdk.hash | 1 + package/openjdk/openjdk.mk | 9 +++++++++ 5 files changed, 35 insertions(+)package/openjdk-bin/openjdk-bin.hash +3
-0@@ -1,6 +1,9 @@ # From https://github.com/AdoptOpenJDK/openjdk14-binaries/releases sha256 9ddf9b35996fbd784a53fff3e0d59920a7d5acf1a82d4c8d70906957ac146cd1 OpenJDK14U-jdk_x64_linux_hotspot_14.0.1_7.tar.gz +# From https://github.com/AdoptOpenJDK/openjdk11-binaries/releases +sha256 ee60304d782c9d5654bf1a6b3f38c683921c1711045e1db94525a51b7024a2ca OpenJDK11U-jdk_x64_linux_hotspot_11.0.7_10.tar.gz + # Locally calculated sha256 4b9abebc4338048a7c2dc184e9f800deb349366bdf28eb23c2677a77b4c87726 legal/java.prefs/LICENSE sha256 a44eb7b5caf5534c6ef536b21edb40b4d6babf91bf97d9d45596868618b2c6fb legal/java.prefs/ASSEMBLY_EXCEPTIONpackage/openjdk-bin/openjdk-bin.mk +8
-0@@ -4,11 +4,19 @@ # ################################################################################ +ifeq ($(BR2_OPENJDK_VERSION_11_X),y) +HOST_OPENJDK_BIN_VERSION_MAJOR = 11.0.7 +HOST_OPENJDK_BIN_VERSION_MINOR = 10 +HOST_OPENJDK_BIN_VERSION = $(HOST_OPENJDK_BIN_VERSION_MAJOR)_$(HOST_OPENJDK_BIN_VERSION_MINOR) +HOST_OPENJDK_BIN_SOURCE = OpenJDK11U-jdk_x64_linux_hotspot_$(HOST_OPENJDK_BIN_VERSION).tar.gz +HOST_OPENJDK_BIN_SITE = https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-$(HOST_OPENJDK_BIN_VERSION_MAJOR)%2B$(HOST_OPENJDK_BIN_VERSION_MINOR) +else HOST_OPENJDK_BIN_VERSION_MAJOR = 14.0.1 HOST_OPENJDK_BIN_VERSION_MINOR = 7 HOST_OPENJDK_BIN_VERSION = $(HOST_OPENJDK_BIN_VERSION_MAJOR)_$(HOST_OPENJDK_BIN_VERSION_MINOR) HOST_OPENJDK_BIN_SOURCE = OpenJDK14U-jdk_x64_linux_hotspot_$(HOST_OPENJDK_BIN_VERSION).tar.gz HOST_OPENJDK_BIN_SITE = https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-$(HOST_OPENJDK_BIN_VERSION_MAJOR)%2B$(HOST_OPENJDK_BIN_VERSION_MINOR) +endif HOST_OPENJDK_BIN_LICENSE = GPL-2.0+ with exception HOST_OPENJDK_BIN_LICENSE_FILES = legal/java.prefs/LICENSE legal/java.prefs/ASSEMBLY_EXCEPTIONpackage/openjdk/Config.in +14
-0@@ -49,6 +49,20 @@ config BR2_PACKAGE_OPENJDK if BR2_PACKAGE_OPENJDK +choice + prompt "openjdk version" + default BR2_OPENJDK_VERSION_11_X + help + Select the version of OpenJDK you wish to use. + +config BR2_OPENJDK_VERSION_11_X + bool "OpenJDK 11 (LTS)" + +config BR2_OPENJDK_VERSION_14_X + bool "OpenJDK 14 (Latest)" + +endchoice + choice prompt "openjdk variant" default BR2_PACKAGE_OPENJDK_JVM_VARIANT_SERVER if !BR2_powerpcpackage/openjdk/openjdk.hash +1
-0@@ -1,3 +1,4 @@ # Locally computed sha256 301203cbda9c40a5fc496b3299806995ac4833b39c6d2e8470fd85a35461afd4 jdk-14.0.1+7.tar.gz +sha256 d105471d06568e4659c21518d1bf42b8ebab5c70539e9777d570549a98ed2a8a jdk-11.0.7+10.tar.gz sha256 4b9abebc4338048a7c2dc184e9f800deb349366bdf28eb23c2677a77b4c87726 LICENSEpackage/openjdk/openjdk.mk +9
-1@@ -4,11 +4,20 @@ # ################################################################################ +ifeq ($(BR2_OPENJDK_VERSION_11_X),y) +OPENJDK_VERSION_MAJOR = 11.0.7 +OPENJDK_VERSION_MINOR = 10 +OPENJDK_VERSION = $(OPENJDK_VERSION_MAJOR)+$(OPENJDK_VERSION_MINOR) +OPENJDK_SOURCE = jdk-$(OPENJDK_VERSION).tar.gz +OPENJDK_SITE = https://hg.openjdk.java.net/jdk-updates/jdk11u/archive +else OPENJDK_VERSION_MAJOR = 14.0.1 OPENJDK_VERSION_MINOR = 7 OPENJDK_VERSION = $(OPENJDK_VERSION_MAJOR)+$(OPENJDK_VERSION_MINOR) OPENJDK_SOURCE = jdk-$(OPENJDK_VERSION).tar.gz OPENJDK_SITE = https://hg.openjdk.java.net/jdk-updates/jdk14u/archive +endif + OPENJDK_LICENSE = GPL-2.0+ with exception OPENJDK_LICENSE_FILES = LICENSE --2.25.3
Quoted 4 lines
_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot--
.-----------------.--------------------.------------------.--------------------.| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |'------------------------------^-------^------------------^--------------------'
PATCH 2/2 package/{openjdk, openjdk-bin}: add support for building either lts or latest
In reply to Yann E. MORINHi Adam et al,
Apologies for being a bit late to the discussion.
I strongly back this patch. OpenJDK has moved to an LTS+newer model in order to test out new features of the Java system (which, admittedly, are minimal right now but which certain proposed changes could have other influences down the track.)
My employer has been using Buildroot for nearly 15 years and some devices we maintain still use Buildroot builds from as much as 12 years ago. We have lobbied regularly for JDK to move to longer releases so we wouldn't have to hang on to such extremely old build environments. The ability to rely on LTS builds (both on JDK and Buildroot itself) significantly reduces this maintenance complexity and allows us to do direct comparisons between LTS and newer releases and offer better ongoing stability.
Thanks so much to Adam for this patch and all his work on the openjdk package recently.
Cheers,
Tudor.
Quoted 185 lines · Yann E. MORIN
Adam, All,
On 2020-04-22 12:21 -0700, aduskett at gmail.com spake thusly:
Quoted 8 lines
From: Adam Duskett <[email protected]>
As Java is used quite a bit in the enterprise world, having the option to
build the LTS version of OpenJDK is quite convenient and also a requirement
for many companies wanting to use Java.Quoted 4 lines
As such, there are three options:
1) Continue only to support the latest version of OpenJDK.
2) Downgrade our existing OpenJDK package from 14 to 11.
3) Add an option to support either OpenJDK 11 or 14.We recently dropped such a choice from another major package, qt5, whwere we decided to only support the latest version, like we do for basically all userland programs (with very little exceptions).
Adding back such a choice in another package does not got with this trend, though...
So I'm deferring the decision for now untill there is more fedback than just "but this is LTS" and "but we need the latest".
Note: the diff itself is not a problem, it loks sane enough. The problem
really is the choice.Regards,
Yann E. MORIN.Quoted 152 lines
OpenJDK 11 and 14 currently have:
- The same configure options.
- The same license files and hashes for those license files.
- The same dependencies.
- The same method to build and install.As such, supporting both 11 and 14 is not only an easy option to add to
Buildroot, but also a nice feature for users who wish to use Java in an
embedded environment with a company that mandates the use of the LTS version.Signed-off-by Adam Duskett <[email protected]>--- package/openjdk-bin/openjdk-bin.hash | 3 +++ package/openjdk-bin/openjdk-bin.mk | 8 ++++++++ package/openjdk/Config.in | 14 ++++++++++++++ package/openjdk/openjdk.hash | 1 + package/openjdk/openjdk.mk | 9 +++++++++ 5 files changed, 35 insertions(+)package/openjdk-bin/openjdk-bin.hash +0
-0@@ -1,6 +1,9 @@ # From https://github.com/AdoptOpenJDK/openjdk14-binaries/releases sha256
9ddf9b35996fbd784a53fff3e0d59920a7d5acf1a82d4c8d70906957ac146cd1OpenJDK14U-jdk_x64_linux_hotspot_14.0.1_7.tar.gzpackage/openjdk-bin/openjdk-bin.hash +2
-0+# From https://github.com/AdoptOpenJDK/openjdk11-binaries/releases +sha256
ee60304d782c9d5654bf1a6b3f38c683921c1711045e1db94525a51b7024a2caOpenJDK11U-jdk_x64_linux_hotspot_11.0.7_10.tar.gz
+
# Locally calculated
sha2564b9abebc4338048a7c2dc184e9f800deb349366bdf28eb23c2677a77b4c87726legal/java.prefs/LICENSE
sha256a44eb7b5caf5534c6ef536b21edb40b4d6babf91bf97d9d45596868618b2c6fblegal/java.prefs/ASSEMBLY_EXCEPTIONpackage/openjdk-bin/openjdk-bin.mk +5
-0@@ -4,11 +4,19 @@ # ################################################################################ +ifeq ($(BR2_OPENJDK_VERSION_11_X),y) +HOST_OPENJDK_BIN_VERSION_MAJOR = 11.0.7 +HOST_OPENJDK_BIN_VERSION_MINOR = 10 +HOST_OPENJDK_BIN_VERSION = $(HOST_OPENJDK_BIN_VERSION_MAJOR)_$(HOST_OPENJDK_BIN_VERSION_MINOR) +HOST_OPENJDK_BIN_SOURCE =OpenJDK11U-jdk_x64_linux_hotspot_$(HOST_OPENJDK_BIN_VERSION).tar.gz +HOST_OPENJDK_BIN_SITE =
https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-$(HOST_OPENJDK_BIN_VERSION_MAJOR)%2B$(HOST_OPENJDK_BIN_VERSION_MINOR)
+else
HOST_OPENJDK_BIN_VERSION_MAJOR= 14.0.1HOST_OPENJDK_BIN_VERSION_MINOR= 7HOST_OPENJDK_BIN_VERSION=
$(HOST_OPENJDK_BIN_VERSION_MAJOR)_$(HOST_OPENJDK_BIN_VERSION_MINOR)
HOST_OPENJDK_BIN_SOURCE=
OpenJDK14U-jdk_x64_linux_hotspot_$(HOST_OPENJDK_BIN_VERSION).tar.gz
HOST_OPENJDK_BIN_SITE=
https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-$(HOST_OPENJDK_BIN_VERSION_MAJOR)%2B$(HOST_OPENJDK_BIN_VERSION_MINOR)
+endif
HOST_OPENJDK_BIN_LICENSE= GPL-2.0+ with exceptionHOST_OPENJDK_BIN_LICENSE_FILES= legal/java.prefs/LICENSE
legal/java.prefs/ASSEMBLY_EXCEPTIONpackage/openjdk/Config.in +14
-0@@ -49,6 +49,20 @@ config BR2_PACKAGE_OPENJDK if BR2_PACKAGE_OPENJDK +choice + prompt "openjdk version" + default BR2_OPENJDK_VERSION_11_X + help + Select the version of OpenJDK you wish to use. + +config BR2_OPENJDK_VERSION_11_X + bool "OpenJDK 11 (LTS)" + +config BR2_OPENJDK_VERSION_14_X + bool "OpenJDK 14 (Latest)" + +endchoice + choice prompt "openjdk variant" default BR2_PACKAGE_OPENJDK_JVM_VARIANT_SERVER if !BR2_powerpcpackage/openjdk/openjdk.hash +0
-0@@ -1,3 +1,4 @@ # Locally computed sha256
301203cbda9c40a5fc496b3299806995ac4833b39c6d2e8470fd85a35461afd4jdk-14.0.1+7.tar.gz
+sha256d105471d06568e4659c21518d1bf42b8ebab5c70539e9777d570549a98ed2a8ajdk-11.0.7+10.tar.gz
sha2564b9abebc4338048a7c2dc184e9f800deb349366bdf28eb23c2677a77b4c87726LICENSEpackage/openjdk/openjdk.mk +9
-1@@ -4,11 +4,20 @@ # ################################################################################ +ifeq ($(BR2_OPENJDK_VERSION_11_X),y) +OPENJDK_VERSION_MAJOR = 11.0.7 +OPENJDK_VERSION_MINOR = 10 +OPENJDK_VERSION = $(OPENJDK_VERSION_MAJOR)+$(OPENJDK_VERSION_MINOR) +OPENJDK_SOURCE = jdk-$(OPENJDK_VERSION).tar.gz +OPENJDK_SITE = https://hg.openjdk.java.net/jdk-updates/jdk11u/archive +else OPENJDK_VERSION_MAJOR = 14.0.1 OPENJDK_VERSION_MINOR = 7 OPENJDK_VERSION = $(OPENJDK_VERSION_MAJOR)+$(OPENJDK_VERSION_MINOR) OPENJDK_SOURCE = jdk-$(OPENJDK_VERSION).tar.gz OPENJDK_SITE = https://hg.openjdk.java.net/jdk-updates/jdk14u/archive +endif + OPENJDK_LICENSE = GPL-2.0+ with exception OPENJDK_LICENSE_FILES = LICENSE --2.25.3
_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
PATCH 2/2 package/{openjdk, openjdk-bin}: add support for building either lts or latest
In reply to aduskett at gmail.comAdam, All,
On 2020-04-22 12:21 -0700, aduskett at gmail.com spake thusly:
Quoted 17 lines
From: Adam Duskett <[email protected]>
As Java is used quite a bit in the enterprise world, having the option to build the LTS version of OpenJDK is quite convenient and also a requirement for many companies wanting to use Java.
As such, there are three options:
1) Continue only to support the latest version of OpenJDK.
2) Downgrade our existing OpenJDK package from 14 to 11.
3) Add an option to support either OpenJDK 11 or 14.OpenJDK 11 and 14 currently have:
- The same configure options.
- The same license files and hashes for those license files.
- The same dependencies.
- The same method to build and install.
Quoted 5 lines
As such, supporting both 11 and 14 is not only an easy option to add to Buildroot, but also a nice feature for users who wish to use Java in an embedded environment with a company that mandates the use of the LTS version.
Signed-off-by Adam Duskett <[email protected]>
I was not too much in favour of the patch, and when we discussed it between maintainers, we all were also rather unsure about it either.
But the simplicity of the patch, and the fact that Java (whether we like it or not) is a prominent language and OpenJDK a prominent package, we concluded that the harm of introducing that choice was not that bad in the end, and reverting is always an option should things turn bad.
so I have applied, after tweaking it a bit:
- made latest the default, so that existing defconfig files are not impacted
- rename the options to LTS and LATEST, so it is obvious that the choice is about that, not about 11 vs. 14
- misc eye-candy about choice location in the file, blabla my usual
grumpyness... ;-)
Appiled to master, thanks.
Regards,
Yann E. MORIN.
Quoted 112 lines
--- package/openjdk-bin/openjdk-bin.hash | 3 +++ package/openjdk-bin/openjdk-bin.mk | 8 ++++++++ package/openjdk/Config.in | 14 ++++++++++++++ package/openjdk/openjdk.hash | 1 + package/openjdk/openjdk.mk | 9 +++++++++ 5 files changed, 35 insertions(+)package/openjdk-bin/openjdk-bin.hash +3
-0@@ -1,6 +1,9 @@ # From https://github.com/AdoptOpenJDK/openjdk14-binaries/releases sha256 9ddf9b35996fbd784a53fff3e0d59920a7d5acf1a82d4c8d70906957ac146cd1 OpenJDK14U-jdk_x64_linux_hotspot_14.0.1_7.tar.gz +# From https://github.com/AdoptOpenJDK/openjdk11-binaries/releases +sha256 ee60304d782c9d5654bf1a6b3f38c683921c1711045e1db94525a51b7024a2ca OpenJDK11U-jdk_x64_linux_hotspot_11.0.7_10.tar.gz + # Locally calculated sha256 4b9abebc4338048a7c2dc184e9f800deb349366bdf28eb23c2677a77b4c87726 legal/java.prefs/LICENSE sha256 a44eb7b5caf5534c6ef536b21edb40b4d6babf91bf97d9d45596868618b2c6fb legal/java.prefs/ASSEMBLY_EXCEPTIONpackage/openjdk-bin/openjdk-bin.mk +8
-0@@ -4,11 +4,19 @@ # ################################################################################ +ifeq ($(BR2_OPENJDK_VERSION_11_X),y) +HOST_OPENJDK_BIN_VERSION_MAJOR = 11.0.7 +HOST_OPENJDK_BIN_VERSION_MINOR = 10 +HOST_OPENJDK_BIN_VERSION = $(HOST_OPENJDK_BIN_VERSION_MAJOR)_$(HOST_OPENJDK_BIN_VERSION_MINOR) +HOST_OPENJDK_BIN_SOURCE = OpenJDK11U-jdk_x64_linux_hotspot_$(HOST_OPENJDK_BIN_VERSION).tar.gz +HOST_OPENJDK_BIN_SITE = https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-$(HOST_OPENJDK_BIN_VERSION_MAJOR)%2B$(HOST_OPENJDK_BIN_VERSION_MINOR) +else HOST_OPENJDK_BIN_VERSION_MAJOR = 14.0.1 HOST_OPENJDK_BIN_VERSION_MINOR = 7 HOST_OPENJDK_BIN_VERSION = $(HOST_OPENJDK_BIN_VERSION_MAJOR)_$(HOST_OPENJDK_BIN_VERSION_MINOR) HOST_OPENJDK_BIN_SOURCE = OpenJDK14U-jdk_x64_linux_hotspot_$(HOST_OPENJDK_BIN_VERSION).tar.gz HOST_OPENJDK_BIN_SITE = https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-$(HOST_OPENJDK_BIN_VERSION_MAJOR)%2B$(HOST_OPENJDK_BIN_VERSION_MINOR) +endif HOST_OPENJDK_BIN_LICENSE = GPL-2.0+ with exception HOST_OPENJDK_BIN_LICENSE_FILES = legal/java.prefs/LICENSE legal/java.prefs/ASSEMBLY_EXCEPTIONpackage/openjdk/Config.in +14
-0@@ -49,6 +49,20 @@ config BR2_PACKAGE_OPENJDK if BR2_PACKAGE_OPENJDK +choice + prompt "openjdk version" + default BR2_OPENJDK_VERSION_11_X + help + Select the version of OpenJDK you wish to use. + +config BR2_OPENJDK_VERSION_11_X + bool "OpenJDK 11 (LTS)" + +config BR2_OPENJDK_VERSION_14_X + bool "OpenJDK 14 (Latest)" + +endchoice + choice prompt "openjdk variant" default BR2_PACKAGE_OPENJDK_JVM_VARIANT_SERVER if !BR2_powerpcpackage/openjdk/openjdk.hash +1
-0@@ -1,3 +1,4 @@ # Locally computed sha256 301203cbda9c40a5fc496b3299806995ac4833b39c6d2e8470fd85a35461afd4 jdk-14.0.1+7.tar.gz +sha256 d105471d06568e4659c21518d1bf42b8ebab5c70539e9777d570549a98ed2a8a jdk-11.0.7+10.tar.gz sha256 4b9abebc4338048a7c2dc184e9f800deb349366bdf28eb23c2677a77b4c87726 LICENSEpackage/openjdk/openjdk.mk +9
-0@@ -4,11 +4,20 @@ # ################################################################################ +ifeq ($(BR2_OPENJDK_VERSION_11_X),y) +OPENJDK_VERSION_MAJOR = 11.0.7 +OPENJDK_VERSION_MINOR = 10 +OPENJDK_VERSION = $(OPENJDK_VERSION_MAJOR)+$(OPENJDK_VERSION_MINOR) +OPENJDK_SOURCE = jdk-$(OPENJDK_VERSION).tar.gz +OPENJDK_SITE = https://hg.openjdk.java.net/jdk-updates/jdk11u/archive +else OPENJDK_VERSION_MAJOR = 14.0.1 OPENJDK_VERSION_MINOR = 7 OPENJDK_VERSION = $(OPENJDK_VERSION_MAJOR)+$(OPENJDK_VERSION_MINOR) OPENJDK_SOURCE = jdk-$(OPENJDK_VERSION).tar.gz OPENJDK_SITE = https://hg.openjdk.java.net/jdk-updates/jdk14u/archive +endif + OPENJDK_LICENSE = GPL-2.0+ with exception OPENJDK_LICENSE_FILES = LICENSESignature · 6 lines
2.25.3 _______________________________________________ buildroot mailing list buildroot at busybox.net http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
Yann E. MORIN
AppliedPATCH 1/2 package/{openjdk, openjdk-bin}: bump version to 14.0.1+7
In reply to aduskett at gmail.comAdam, all,
On 2020-04-22 12:21 -0700, aduskett at gmail.com spake thusly:
Quoted 3 lines
From: Adam Duskett <[email protected]>
Signed-off-by Adam Duskett <[email protected]>
Applied to master, thanks.
I am however not going to apply patch 2, which I think needs some discussion...
Regards,
Yann E. MORIN.
Quoted 69 lines
--- package/openjdk-bin/openjdk-bin.hash | 8 ++++---- package/openjdk-bin/openjdk-bin.mk | 4 ++-- package/openjdk/openjdk.hash | 4 ++-- package/openjdk/openjdk.mk | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-)package/openjdk-bin/openjdk-bin.hash +4
-4@@ -1,6 +1,6 @@ -# From https://github.com/AdoptOpenJDK/openjdk12-binaries/releases -sha256 6c06853332585ab58834d9e8a02774b388e6e062ef6c4084b4f058c67f2e81b5 OpenJDK14U-jdk_x64_linux_hotspot_14_36.tar.gz +# From https://github.com/AdoptOpenJDK/openjdk14-binaries/releases +sha256 9ddf9b35996fbd784a53fff3e0d59920a7d5acf1a82d4c8d70906957ac146cd1 OpenJDK14U-jdk_x64_linux_hotspot_14.0.1_7.tar.gz # Locally calculated -sha256 4b9abebc4338048a7c2dc184e9f800deb349366bdf28eb23c2677a77b4c87726 legal/java.prefs/LICENSE -sha256 a44eb7b5caf5534c6ef536b21edb40b4d6babf91bf97d9d45596868618b2c6fb legal/java.prefs/ASSEMBLY_EXCEPTION +sha256 4b9abebc4338048a7c2dc184e9f800deb349366bdf28eb23c2677a77b4c87726 legal/java.prefs/LICENSE +sha256 a44eb7b5caf5534c6ef536b21edb40b4d6babf91bf97d9d45596868618b2c6fb legal/java.prefs/ASSEMBLY_EXCEPTIONpackage/openjdk-bin/openjdk-bin.mk +2
-2@@ -4,8 +4,8 @@ # ################################################################################ -HOST_OPENJDK_BIN_VERSION_MAJOR = 14 -HOST_OPENJDK_BIN_VERSION_MINOR = 36 +HOST_OPENJDK_BIN_VERSION_MAJOR = 14.0.1 +HOST_OPENJDK_BIN_VERSION_MINOR = 7 HOST_OPENJDK_BIN_VERSION = $(HOST_OPENJDK_BIN_VERSION_MAJOR)_$(HOST_OPENJDK_BIN_VERSION_MINOR) HOST_OPENJDK_BIN_SOURCE = OpenJDK14U-jdk_x64_linux_hotspot_$(HOST_OPENJDK_BIN_VERSION).tar.gz HOST_OPENJDK_BIN_SITE = https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-$(HOST_OPENJDK_BIN_VERSION_MAJOR)%2B$(HOST_OPENJDK_BIN_VERSION_MINOR)package/openjdk/openjdk.hash +2
-2@@ -1,3 +1,3 @@ # Locally computed -sha256 6815dbac7dd0f86291254e84ed17565c89477eeb6b0847a9648b00ecb4f07634 jdk-14+36.tar.gz -sha256 4b9abebc4338048a7c2dc184e9f800deb349366bdf28eb23c2677a77b4c87726 LICENSE +sha256 301203cbda9c40a5fc496b3299806995ac4833b39c6d2e8470fd85a35461afd4 jdk-14.0.1+7.tar.gz +sha256 4b9abebc4338048a7c2dc184e9f800deb349366bdf28eb23c2677a77b4c87726 LICENSEpackage/openjdk/openjdk.mk +2
-2@@ -4,8 +4,8 @@ # ################################################################################ -OPENJDK_VERSION_MAJOR = 14 -OPENJDK_VERSION_MINOR = 36 +OPENJDK_VERSION_MAJOR = 14.0.1 +OPENJDK_VERSION_MINOR = 7 OPENJDK_VERSION = $(OPENJDK_VERSION_MAJOR)+$(OPENJDK_VERSION_MINOR) OPENJDK_SOURCE = jdk-$(OPENJDK_VERSION).tar.gz OPENJDK_SITE = https://hg.openjdk.java.net/jdk-updates/jdk14u/archiveSignature · 6 lines
2.25.3 _______________________________________________ buildroot mailing list buildroot at busybox.net http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
PATCH 1/2 package/{openjdk, openjdk-bin}: bump version to 14.0.1+7
In reply to aduskett at gmail.comQuoted 4 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"aduskett" == aduskett <[email protected]> writes:
From: Adam Duskett <[email protected]>
Signed-off-by Adam Duskett <[email protected]>
Does this fix any security issues? If so, are there any corresponding 13.x update for 2020.02.x?
Signature · 1 line
Bye, Peter Korsgaard