package/openjdk{, -bin}: fix wrong version reporting
PATCH 1/1 package/openjdk{, -bin}: fix wrong version reporting
From: Thomas Devoogdt <[email protected]>
Before:
$ java --version openjdk 17 2024-07-16 OpenJDK Runtime Environment (build 17+17) OpenJDK 64-Bit Server VM (build 17+17, mixed mode)
After:
$ java --version openjdk 17.0.12 2024-07-16 OpenJDK Runtime Environment (build 17.0.12+7) OpenJDK 64-Bit Server VM (build 17.0.12+7, mixed mode)
Signed-off-by Thomas Devoogdt <[email protected]>
--- package/openjdk-bin/openjdk-bin.mk | 8 +++++--- package/openjdk/openjdk.mk | 13 ++++++++----- 2 files changed, 13 insertions(+), 8 deletions(-)
package/openjdk-bin/openjdk-bin.mk +5 -3
@@ -6,10 +6,12 @@ ifeq ($(BR2_PACKAGE_OPENJDK_VERSION_21),y) HOST_OPENJDK_BIN_VERSION_MAJOR = 21 -HOST_OPENJDK_BIN_VERSION_MINOR = 0.4_7 +HOST_OPENJDK_BIN_VERSION_MINOR = 0.4 +HOST_OPENJDK_BIN_VERSION_BUILD = 7 else HOST_OPENJDK_BIN_VERSION_MAJOR = 17 -HOST_OPENJDK_BIN_VERSION_MINOR = 0.12_7 +HOST_OPENJDK_BIN_VERSION_MINOR = 0.12 +HOST_OPENJDK_BIN_VERSION_BUILD = 7 endif ifeq ($(HOSTARCH),x86_64)
@@ -19,7 +21,7 @@ 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_VERSION = $(HOST_OPENJDK_BIN_VERSION_MAJOR).$(HOST_OPENJDK_BIN_VERSION_MINOR)_$(HOST_OPENJDK_BIN_VERSION_BUILD) 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))
package/openjdk/openjdk.mk +8 -5
@@ -6,12 +6,15 @@ ifeq ($(BR2_PACKAGE_OPENJDK_VERSION_21),y) OPENJDK_VERSION_MAJOR = 21 -OPENJDK_VERSION_MINOR = 0.4+7 +OPENJDK_VERSION_MINOR = 0.4 +OPENJDK_VERSION_BUILD = 7 + else OPENJDK_VERSION_MAJOR = 17 -OPENJDK_VERSION_MINOR = 0.12+7 +OPENJDK_VERSION_MINOR = 0.12 +OPENJDK_VERSION_BUILD = 7 endif -OPENJDK_VERSION = $(OPENJDK_VERSION_MAJOR).$(OPENJDK_VERSION_MINOR) +OPENJDK_VERSION = $(OPENJDK_VERSION_MAJOR).$(OPENJDK_VERSION_MINOR)+$(OPENJDK_VERSION_BUILD) OPENJDK_SITE = $(call github,openjdk,jdk$(OPENJDK_VERSION_MAJOR)u,jdk-$(OPENJDK_VERSION)) OPENJDK_LICENSE = GPL-2.0+ with exception
@@ -102,8 +105,8 @@ OPENJDK_CONF_OPTS = \ --with-native-debug-symbols=none \ --without-version-pre \ --with-sysroot=$(STAGING_DIR) \ - --with-version-build="$(OPENJDK_VERSION_MAJOR)" \ - --with-version-string="$(OPENJDK_VERSION_MAJOR)" + --with-version-build="$(OPENJDK_VERSION_BUILD)" \ + --with-version-string="$(OPENJDK_VERSION_MAJOR).$(OPENJDK_VERSION_MINOR)" # If building for AArch64, use the provided CPU port. ifeq ($(BR2_aarch64),y)
Signature · 6 lines
2.43.0 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Quoted 10 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Thomas" == Thomas Devoogdt <[email protected]> writes:
From: Thomas Devoogdt <[email protected]>
Before:$ java --version openjdk 17 2024-07-16 OpenJDK Runtime Environment (build 17+17) OpenJDK 64-Bit Server VM (build 17+17, mixed mode)
Quoted 8 lines
After:
$ java --version openjdk 17.0.12 2024-07-16 OpenJDK Runtime Environment (build 17.0.12+7) OpenJDK 64-Bit Server VM (build 17.0.12+7, mixed mode)Signed-off-by Thomas Devoogdt <[email protected]>
Committed, thanks.
Signature · 5 lines
Bye, Peter Korsgaard _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Quoted 9 lines · Thomas Devoogdt
From: Thomas Devoogdt <[email protected]>
Before:
$ java --version openjdk 17 2024-07-16 OpenJDK Runtime Environment (build 17+17) OpenJDK 64-Bit Server VM (build 17+17, mixed mode)
Quoted 8 lines
After:
$ java --version openjdk 17.0.12 2024-07-16 OpenJDK Runtime Environment (build 17.0.12+7) OpenJDK 64-Bit Server VM (build 17.0.12+7, mixed mode)Signed-off-by Thomas Devoogdt <[email protected]>
Applied to 2025.02.x and 2025.08.x, thanks.
Regards,
Arnout
Quoted 57 lines
--- package/openjdk-bin/openjdk-bin.mk | 8 +++++--- package/openjdk/openjdk.mk | 13 ++++++++----- 2 files changed, 13 insertions(+), 8 deletions(-)package/openjdk-bin/openjdk-bin.mk +5
-3@@ -6,10 +6,12 @@ ifeq ($(BR2_PACKAGE_OPENJDK_VERSION_21),y) HOST_OPENJDK_BIN_VERSION_MAJOR = 21 -HOST_OPENJDK_BIN_VERSION_MINOR = 0.4_7 +HOST_OPENJDK_BIN_VERSION_MINOR = 0.4 +HOST_OPENJDK_BIN_VERSION_BUILD = 7 else HOST_OPENJDK_BIN_VERSION_MAJOR = 17 -HOST_OPENJDK_BIN_VERSION_MINOR = 0.12_7 +HOST_OPENJDK_BIN_VERSION_MINOR = 0.12 +HOST_OPENJDK_BIN_VERSION_BUILD = 7 endif ifeq ($(HOSTARCH),x86_64)@@ -19,7 +21,7 @@ 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_VERSION = $(HOST_OPENJDK_BIN_VERSION_MAJOR).$(HOST_OPENJDK_BIN_VERSION_MINOR)_$(HOST_OPENJDK_BIN_VERSION_BUILD) 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))package/openjdk/openjdk.mk +6
-3@@ -6,12 +6,15 @@ ifeq ($(BR2_PACKAGE_OPENJDK_VERSION_21),y) OPENJDK_VERSION_MAJOR = 21 -OPENJDK_VERSION_MINOR = 0.4+7 +OPENJDK_VERSION_MINOR = 0.4 +OPENJDK_VERSION_BUILD = 7 + else OPENJDK_VERSION_MAJOR = 17 -OPENJDK_VERSION_MINOR = 0.12+7 +OPENJDK_VERSION_MINOR = 0.12 +OPENJDK_VERSION_BUILD = 7 endif -OPENJDK_VERSION = $(OPENJDK_VERSION_MAJOR).$(OPENJDK_VERSION_MINOR) +OPENJDK_VERSION = $(OPENJDK_VERSION_MAJOR).$(OPENJDK_VERSION_MINOR)+$(OPENJDK_VERSION_BUILD) OPENJDK_SITE = $(call github,openjdk,jdk$(OPENJDK_VERSION_MAJOR)u,jdk-$(OPENJDK_VERSION)) OPENJDK_LICENSE = GPL-2.0+ with exception
package/openjdk/openjdk.mk OPENJDK_CONF_OPTS = \ · line 112
Quoted 10 lines
package/openjdk/openjdk.mk +2
-2@@ -102,8 +105,8 @@ OPENJDK_CONF_OPTS = \ --with-native-debug-symbols=none \ --without-version-pre \ --with-sysroot=$(STAGING_DIR) \ - --with-version-build="$(OPENJDK_VERSION_MAJOR)" \ - --with-version-string="$(OPENJDK_VERSION_MAJOR)" + --with-version-build="$(OPENJDK_VERSION_BUILD)" \ + --with-version-string="$(OPENJDK_VERSION_MAJOR).$(OPENJDK_VERSION_MINOR)" # If building for AArch64, use the provided CPU port. ifeq ($(BR2_aarch64),y)
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot