* [Buildroot] [PATCH] package/openjdk{, -bin}: fix wrong version reporting
@ 2025-11-14 14:05 Thomas Devoogdt
2025-11-16 22:08 ` Peter Korsgaard
2025-11-27 20:00 ` Arnout Vandecappelle via buildroot
0 siblings, 2 replies; 3+ messages in thread
From: Thomas Devoogdt @ 2025-11-14 14:05 UTC (permalink / raw)
To: buildroot; +Cc: Tudor Holton, Thomas Devoogdt
From: Thomas Devoogdt <thomas.devoogdt@barco.com>
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 <thomas.devoogdt@barco.com>
---
package/openjdk-bin/openjdk-bin.mk | 8 +++++---
package/openjdk/openjdk.mk | 13 ++++++++-----
2 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/package/openjdk-bin/openjdk-bin.mk b/package/openjdk-bin/openjdk-bin.mk
index 17056e80b7..e6c74cf6d8 100644
--- a/package/openjdk-bin/openjdk-bin.mk
+++ b/package/openjdk-bin/openjdk-bin.mk
@@ -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))
diff --git a/package/openjdk/openjdk.mk b/package/openjdk/openjdk.mk
index f59eb69782..1ec9863e98 100644
--- a/package/openjdk/openjdk.mk
+++ b/package/openjdk/openjdk.mk
@@ -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)
--
2.43.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [Buildroot] [PATCH] package/openjdk{, -bin}: fix wrong version reporting
2025-11-14 14:05 [Buildroot] [PATCH] package/openjdk{, -bin}: fix wrong version reporting Thomas Devoogdt
@ 2025-11-16 22:08 ` Peter Korsgaard
2025-11-27 20:00 ` Arnout Vandecappelle via buildroot
1 sibling, 0 replies; 3+ messages in thread
From: Peter Korsgaard @ 2025-11-16 22:08 UTC (permalink / raw)
To: Thomas Devoogdt; +Cc: buildroot, Tudor Holton, Thomas Devoogdt
>>>>> "Thomas" == Thomas Devoogdt <thomas@devoogdt.com> writes:
> From: Thomas Devoogdt <thomas.devoogdt@barco.com>
> 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 <thomas.devoogdt@barco.com>
Committed, thanks.
--
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [Buildroot] [PATCH] package/openjdk{, -bin}: fix wrong version reporting
2025-11-14 14:05 [Buildroot] [PATCH] package/openjdk{, -bin}: fix wrong version reporting Thomas Devoogdt
2025-11-16 22:08 ` Peter Korsgaard
@ 2025-11-27 20:00 ` Arnout Vandecappelle via buildroot
1 sibling, 0 replies; 3+ messages in thread
From: Arnout Vandecappelle via buildroot @ 2025-11-27 20:00 UTC (permalink / raw)
To: Thomas Devoogdt, buildroot; +Cc: Tudor Holton, Thomas Devoogdt
On 14/11/2025 15:05, Thomas Devoogdt wrote:
> From: Thomas Devoogdt <thomas.devoogdt@barco.com>
>
> 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 <thomas.devoogdt@barco.com>
Applied to 2025.02.x and 2025.08.x, thanks.
Regards,
Arnout
> ---
> package/openjdk-bin/openjdk-bin.mk | 8 +++++---
> package/openjdk/openjdk.mk | 13 ++++++++-----
> 2 files changed, 13 insertions(+), 8 deletions(-)
>
> diff --git a/package/openjdk-bin/openjdk-bin.mk b/package/openjdk-bin/openjdk-bin.mk
> index 17056e80b7..e6c74cf6d8 100644
> --- a/package/openjdk-bin/openjdk-bin.mk
> +++ b/package/openjdk-bin/openjdk-bin.mk
> @@ -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))
>
> diff --git a/package/openjdk/openjdk.mk b/package/openjdk/openjdk.mk
> index f59eb69782..1ec9863e98 100644
> --- a/package/openjdk/openjdk.mk
> +++ b/package/openjdk/openjdk.mk
> @@ -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)
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-11-27 20:00 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-11-14 14:05 [Buildroot] [PATCH] package/openjdk{, -bin}: fix wrong version reporting Thomas Devoogdt
2025-11-16 22:08 ` Peter Korsgaard
2025-11-27 20:00 ` Arnout Vandecappelle via buildroot
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.