[Buildroot] [PATCH v2 1/3] testing/tests/package/test_openjdk.py: bump kernel version to 5.10.34

Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed

* [Buildroot] [PATCH v2 1/3] testing/tests/package/test_openjdk.py: bump kernel version to 5.10.34
@ 2021-05-04 21:00 Adam Duskett
  2021-05-04 21:00 ` [Buildroot] [PATCH v2 2/3] package/openjdk: Change URL to Github Adam Duskett
                   ` (3 more replies)
  0 siblings, 4 replies; 8+ messages in thread
From: Adam Duskett @ 2021-05-04 21:00 UTC (permalink / raw)
  To: buildroot

Kernel 4.16.7 is old enough to produce the "multiple definition of `yylloc'"
error which is fixed in newer versions.

Bump the test kernel version from 4.16.7 to 5.10.34 to prevent this error wwhen
building the test image.

Signed-off-by: Adam Duskett <aduskett@gmail.com>
---
 support/testing/tests/package/test_openjdk.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/support/testing/tests/package/test_openjdk.py b/support/testing/tests/package/test_openjdk.py
index 3a1d1a9b09..26b7f9ee92 100644
--- a/support/testing/tests/package/test_openjdk.py
+++ b/support/testing/tests/package/test_openjdk.py
@@ -12,7 +12,7 @@ class TestOpenJdk(infra.basetest.BRTest):
         BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0"
         BR2_LINUX_KERNEL=y
         BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-        BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.7"
+        BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.34"
         BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
         BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config"
         BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
-- 
2.31.1

^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [Buildroot] [PATCH v2 2/3] package/openjdk: Change URL to Github
  2021-05-04 21:00 [Buildroot] [PATCH v2 1/3] testing/tests/package/test_openjdk.py: bump kernel version to 5.10.34 Adam Duskett
@ 2021-05-04 21:00 ` Adam Duskett
  2021-05-05 20:38   ` Yann E. MORIN
  2021-05-04 21:00 ` [Buildroot] [PATCH v2 3/3] package/openjdk{, -bin}: bump latest to version 16.0.1+9 Adam Duskett
                   ` (2 subsequent siblings)
  3 siblings, 1 reply; 8+ messages in thread
From: Adam Duskett @ 2021-05-04 21:00 UTC (permalink / raw)
  To: buildroot

When introducing OpenJDK to buildroot, the OpenJDK project did not put releases
on their GitHub page. Since then, the OpenJDK developers have not only added
OpenJDK releases to Github; they are starting to phase out adding releases to
their public-facing mercurial repository.

Compare the following URLs:
https://wiki.openjdk.java.net/display/JDKUpdates/JDK+14u
https://wiki.openjdk.java.net/display/JDKUpdates/JDK+15u
https://wiki.openjdk.java.net/display/JDKUpdates/JDK+16u

With JDK14, only the mercurial repository is listed. With OpenJDK15, both the
GitHub and mercurial repository are listed. Finally, with OpenJDK16, only the
GitHub repository is listed.

For consistency's sake, and for the upcoming version bump of JDK latest from
14 to 16 do the following:
  - Change the repositories of both OpenJDK14 and OpenJDK11 to point to
    their official GitHub repositories, respectively.

  - In order to simplify and reuse the GitHub URL, modify the
    OPENJDK_VERSION_MAJOR and OPENJDK_VERSION_MINOR definitions to only
    include a single number for the MAJOR definition.

  - Change openjdk-bin.mk to also use the same format as the openjdk.mk file

Note:
The change in SHA sums for the tarballs is due to removing the
.hg_archival.txt in the tarballs. All other files are an exact match.

Signed-off-by: Adam Duskett <aduskett@gmail.com>
---
 package/openjdk-bin/openjdk-bin.mk | 18 ++++++++----------
 package/openjdk/openjdk.hash       |  4 ++--
 package/openjdk/openjdk.mk         | 18 +++++++-----------
 3 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/package/openjdk-bin/openjdk-bin.mk b/package/openjdk-bin/openjdk-bin.mk
index 61e7ecac4c..2d8c018403 100644
--- a/package/openjdk-bin/openjdk-bin.mk
+++ b/package/openjdk-bin/openjdk-bin.mk
@@ -5,18 +5,16 @@
 ################################################################################
 
 ifeq ($(BR2_OPENJDK_VERSION_LATEST),y)
-HOST_OPENJDK_BIN_VERSION_MAJOR = 14.0.2
-HOST_OPENJDK_BIN_VERSION_MINOR = 12
-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)
+HOST_OPENJDK_BIN_VERSION_MAJOR = 14
+HOST_OPENJDK_BIN_VERSION_MINOR = 0.2_12
 else
-HOST_OPENJDK_BIN_VERSION_MAJOR = 11.0.11
-HOST_OPENJDK_BIN_VERSION_MINOR = 9
-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)
+HOST_OPENJDK_BIN_VERSION_MAJOR = 11
+HOST_OPENJDK_BIN_VERSION_MINOR = 0.11_9
 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_x64_linux_hotspot_$(HOST_OPENJDK_BIN_VERSION).tar.gz
+HOST_OPENJDK_BIN_SITE = https://github.com/AdoptOpenJDK/openjdk$(HOST_OPENJDK_BIN_VERSION_MAJOR)-binaries/releases/download/jdk-$(subst _,%2B,$(HOST_OPENJDK_BIN_VERSION))
+
 HOST_OPENJDK_BIN_LICENSE = GPL-2.0+ with exception
 HOST_OPENJDK_BIN_LICENSE_FILES = legal/java.prefs/LICENSE legal/java.prefs/ASSEMBLY_EXCEPTION
 
diff --git a/package/openjdk/openjdk.hash b/package/openjdk/openjdk.hash
index 05a0c12c45..35cd827d2d 100644
--- a/package/openjdk/openjdk.hash
+++ b/package/openjdk/openjdk.hash
@@ -1,4 +1,4 @@
 # Locally computed
-sha256  dfb3607f1b675458f29a185a40f1dbbf896439cf33b3aa0f3d89df297e604935  jdk-14.0.2+12.tar.gz
-sha256  c8b9d92028f6e46d94bde65ebce3b593fdcc0d1ca1fa00482f38815ed37c92a1  jdk-11.0.11+9.tar.gz
+sha256  582e3d805ab74582332250f95f9845608c8f3d3273aa92af6f683c45d1a4f8e8  jdk-14.0.2+12.tar.gz
+sha256  55841c01dbe6606e0d5f88045fb2da02632ce3a2d9d9b25d030a06eadeee0f62  jdk-11.0.11+9.tar.gz
 sha256  4b9abebc4338048a7c2dc184e9f800deb349366bdf28eb23c2677a77b4c87726  LICENSE
diff --git a/package/openjdk/openjdk.mk b/package/openjdk/openjdk.mk
index 6ed5085fdb..cda038805b 100644
--- a/package/openjdk/openjdk.mk
+++ b/package/openjdk/openjdk.mk
@@ -5,19 +5,15 @@
 ################################################################################
 
 ifeq ($(BR2_OPENJDK_VERSION_LATEST),y)
-OPENJDK_VERSION_MAJOR = 14.0.2
-OPENJDK_VERSION_MINOR = 12
-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
+OPENJDK_VERSION_MAJOR = 14
+OPENJDK_VERSION_MINOR = 0.2+12
 else
-OPENJDK_VERSION_MAJOR = 11.0.11
-OPENJDK_VERSION_MINOR = 9
-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
+OPENJDK_VERSION_MAJOR = 11
+OPENJDK_VERSION_MINOR = 0.11+9
 endif
-
+OPENJDK_VERSION = $(OPENJDK_VERSION_MAJOR).$(OPENJDK_VERSION_MINOR)
+OPENJDK_SOURCE = jdk-$(OPENJDK_VERSION).tar.gz
+OPENJDK_SITE = $(call github,openjdk,jdk$(OPENJDK_VERSION_MAJOR)u,jdk-$(OPENJDK_VERSION))
 OPENJDK_LICENSE = GPL-2.0+ with exception
 OPENJDK_LICENSE_FILES = LICENSE
 OPENJDK_INSTALL_STAGING = YES
-- 
2.31.1

^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [Buildroot] [PATCH v2 2/3] package/openjdk: Change URL to Github
  2021-05-04 21:00 ` [Buildroot] [PATCH v2 2/3] package/openjdk: Change URL to Github Adam Duskett
@ 2021-05-05 20:38   ` Yann E. MORIN
  2021-05-06  6:53     ` Arnout Vandecappelle
  0 siblings, 1 reply; 8+ messages in thread
From: Yann E. MORIN @ 2021-05-05 20:38 UTC (permalink / raw)
  To: buildroot

Adam, All,

On 2021-05-04 14:00 -0700, Adam Duskett spake thusly:
> When introducing OpenJDK to buildroot, the OpenJDK project did not put releases
> on their GitHub page. Since then, the OpenJDK developers have not only added
> OpenJDK releases to Github; they are starting to phase out adding releases to
> their public-facing mercurial repository.
> 
> Compare the following URLs:
> https://wiki.openjdk.java.net/display/JDKUpdates/JDK+14u
> https://wiki.openjdk.java.net/display/JDKUpdates/JDK+15u
> https://wiki.openjdk.java.net/display/JDKUpdates/JDK+16u
> 
> With JDK14, only the mercurial repository is listed. With OpenJDK15, both the
> GitHub and mercurial repository are listed. Finally, with OpenJDK16, only the
> GitHub repository is listed.
> 
> For consistency's sake, and for the upcoming version bump of JDK latest from
> 14 to 16 do the following:
>   - Change the repositories of both OpenJDK14 and OpenJDK11 to point to
>     their official GitHub repositories, respectively.
> 
>   - In order to simplify and reuse the GitHub URL, modify the
>     OPENJDK_VERSION_MAJOR and OPENJDK_VERSION_MINOR definitions to only
>     include a single number for the MAJOR definition.
> 
>   - Change openjdk-bin.mk to also use the same format as the openjdk.mk file
> 
> Note:
> The change in SHA sums for the tarballs is due to removing the
> .hg_archival.txt in the tarballs. All other files are an exact match.

So, this is not good, because that means the archives we have on s.b.o
would not longer match what we want to download, so s.b.o can't be used
as a fallback for master anymore.

Alternatively, if we update the archives on s.b.o, that means all our
previous Buildroot releases that referecned OpenJDK 11.0.11+9 would no
longer be able to use s.b.o as a fallback.

So, we can't use the new scheme for 11.0.11+9.

As a consequence:

 1. I've melt the 14->16 bump with the switch to github in a single
    patch
 2. I've entirely dropped the switch to github for OpenJDK11

And eventually, I've applied to master, thanks.

Note that OpenJDK 11.0.12+1 was just released a few hours ago, so that
would be a good opportunity to finalise the switch to github. However,
it seems 11.0.12+1 hasn't showed up in AdoptOpenJDK binaries just yet,
so this will probably have to wait a little bit. Tmorrow, hopefully?

Regards,
Yann E. MORIN.

> Signed-off-by: Adam Duskett <aduskett@gmail.com>
> ---
>  package/openjdk-bin/openjdk-bin.mk | 18 ++++++++----------
>  package/openjdk/openjdk.hash       |  4 ++--
>  package/openjdk/openjdk.mk         | 18 +++++++-----------
>  3 files changed, 17 insertions(+), 23 deletions(-)
> 
> diff --git a/package/openjdk-bin/openjdk-bin.mk b/package/openjdk-bin/openjdk-bin.mk
> index 61e7ecac4c..2d8c018403 100644
> --- a/package/openjdk-bin/openjdk-bin.mk
> +++ b/package/openjdk-bin/openjdk-bin.mk
> @@ -5,18 +5,16 @@
>  ################################################################################
>  
>  ifeq ($(BR2_OPENJDK_VERSION_LATEST),y)
> -HOST_OPENJDK_BIN_VERSION_MAJOR = 14.0.2
> -HOST_OPENJDK_BIN_VERSION_MINOR = 12
> -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)
> +HOST_OPENJDK_BIN_VERSION_MAJOR = 14
> +HOST_OPENJDK_BIN_VERSION_MINOR = 0.2_12
>  else
> -HOST_OPENJDK_BIN_VERSION_MAJOR = 11.0.11
> -HOST_OPENJDK_BIN_VERSION_MINOR = 9
> -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)
> +HOST_OPENJDK_BIN_VERSION_MAJOR = 11
> +HOST_OPENJDK_BIN_VERSION_MINOR = 0.11_9
>  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_x64_linux_hotspot_$(HOST_OPENJDK_BIN_VERSION).tar.gz
> +HOST_OPENJDK_BIN_SITE = https://github.com/AdoptOpenJDK/openjdk$(HOST_OPENJDK_BIN_VERSION_MAJOR)-binaries/releases/download/jdk-$(subst _,%2B,$(HOST_OPENJDK_BIN_VERSION))
> +
>  HOST_OPENJDK_BIN_LICENSE = GPL-2.0+ with exception
>  HOST_OPENJDK_BIN_LICENSE_FILES = legal/java.prefs/LICENSE legal/java.prefs/ASSEMBLY_EXCEPTION
>  
> diff --git a/package/openjdk/openjdk.hash b/package/openjdk/openjdk.hash
> index 05a0c12c45..35cd827d2d 100644
> --- a/package/openjdk/openjdk.hash
> +++ b/package/openjdk/openjdk.hash
> @@ -1,4 +1,4 @@
>  # Locally computed
> -sha256  dfb3607f1b675458f29a185a40f1dbbf896439cf33b3aa0f3d89df297e604935  jdk-14.0.2+12.tar.gz
> -sha256  c8b9d92028f6e46d94bde65ebce3b593fdcc0d1ca1fa00482f38815ed37c92a1  jdk-11.0.11+9.tar.gz
> +sha256  582e3d805ab74582332250f95f9845608c8f3d3273aa92af6f683c45d1a4f8e8  jdk-14.0.2+12.tar.gz
> +sha256  55841c01dbe6606e0d5f88045fb2da02632ce3a2d9d9b25d030a06eadeee0f62  jdk-11.0.11+9.tar.gz
>  sha256  4b9abebc4338048a7c2dc184e9f800deb349366bdf28eb23c2677a77b4c87726  LICENSE
> diff --git a/package/openjdk/openjdk.mk b/package/openjdk/openjdk.mk
> index 6ed5085fdb..cda038805b 100644
> --- a/package/openjdk/openjdk.mk
> +++ b/package/openjdk/openjdk.mk
> @@ -5,19 +5,15 @@
>  ################################################################################
>  
>  ifeq ($(BR2_OPENJDK_VERSION_LATEST),y)
> -OPENJDK_VERSION_MAJOR = 14.0.2
> -OPENJDK_VERSION_MINOR = 12
> -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
> +OPENJDK_VERSION_MAJOR = 14
> +OPENJDK_VERSION_MINOR = 0.2+12
>  else
> -OPENJDK_VERSION_MAJOR = 11.0.11
> -OPENJDK_VERSION_MINOR = 9
> -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
> +OPENJDK_VERSION_MAJOR = 11
> +OPENJDK_VERSION_MINOR = 0.11+9
>  endif
> -
> +OPENJDK_VERSION = $(OPENJDK_VERSION_MAJOR).$(OPENJDK_VERSION_MINOR)
> +OPENJDK_SOURCE = jdk-$(OPENJDK_VERSION).tar.gz
> +OPENJDK_SITE = $(call github,openjdk,jdk$(OPENJDK_VERSION_MAJOR)u,jdk-$(OPENJDK_VERSION))
>  OPENJDK_LICENSE = GPL-2.0+ with exception
>  OPENJDK_LICENSE_FILES = LICENSE
>  OPENJDK_INSTALL_STAGING = YES
> -- 
> 2.31.1
> 
> _______________________________________________
> 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.  |
'------------------------------^-------^------------------^--------------------'

^ permalink raw reply	[flat|nested] 8+ messages in thread

* [Buildroot] [PATCH v2 2/3] package/openjdk: Change URL to Github
  2021-05-05 20:38   ` Yann E. MORIN
@ 2021-05-06  6:53     ` Arnout Vandecappelle
  2021-05-06 19:46       ` Yann E. MORIN
  0 siblings, 1 reply; 8+ messages in thread
From: Arnout Vandecappelle @ 2021-05-06  6:53 UTC (permalink / raw)
  To: buildroot



On 05/05/2021 22:38, Yann E. MORIN wrote:
> So, this is not good, because that means the archives we have on s.b.o
> would not longer match what we want to download, so s.b.o can't be used
> as a fallback for master anymore.

 There's a trivial workaround: drop OPENJDK_SOURCE = .... That way, the tarball
name becomes openjdk-... instead of jdk-... and it's a different file.

 Regards,
 Arnout

^ permalink raw reply	[flat|nested] 8+ messages in thread

* [Buildroot] [PATCH v2 2/3] package/openjdk: Change URL to Github
  2021-05-06  6:53     ` Arnout Vandecappelle
@ 2021-05-06 19:46       ` Yann E. MORIN
  0 siblings, 0 replies; 8+ messages in thread
From: Yann E. MORIN @ 2021-05-06 19:46 UTC (permalink / raw)
  To: buildroot

Arnout, All,

On 2021-05-06 08:53 +0200, Arnout Vandecappelle spake thusly:
> On 05/05/2021 22:38, Yann E. MORIN wrote:
> > So, this is not good, because that means the archives we have on s.b.o
> > would not longer match what we want to download, so s.b.o can't be used
> > as a fallback for master anymore.
>  There's a trivial workaround: drop OPENJDK_SOURCE = .... That way, the tarball
> name becomes openjdk-... instead of jdk-... and it's a different file.

That was my initial proposal, but Adam reinstated the _SOURCE variable,
and I have no idea why I did not further challenge that before
applying...

Indeed, it works (patch pending...) Thanks!

Regards,
Yann E. MORIN.

-- 
.-----------------.--------------------.------------------.--------------------.
|  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.  |
'------------------------------^-------^------------------^--------------------'

^ permalink raw reply	[flat|nested] 8+ messages in thread

* [Buildroot] [PATCH v2 3/3] package/openjdk{, -bin}: bump latest to version 16.0.1+9
  2021-05-04 21:00 [Buildroot] [PATCH v2 1/3] testing/tests/package/test_openjdk.py: bump kernel version to 5.10.34 Adam Duskett
  2021-05-04 21:00 ` [Buildroot] [PATCH v2 2/3] package/openjdk: Change URL to Github Adam Duskett
@ 2021-05-04 21:00 ` Adam Duskett
  2021-05-05 19:37 ` [Buildroot] [PATCH v2 1/3] testing/tests/package/test_openjdk.py: bump kernel version to 5.10.34 Yann E. MORIN
  2021-05-08 14:15 ` Peter Korsgaard
  3 siblings, 0 replies; 8+ messages in thread
From: Adam Duskett @ 2021-05-04 21:00 UTC (permalink / raw)
  To: buildroot

Also, remove upstreamed patch 0001-fix-gcc-10-support.patch as it's no longer
needed.

Signed-off-by: Adam Duskett <aduskett@gmail.com>
---
 package/openjdk-bin/openjdk-bin.hash          |   4 +-
 package/openjdk-bin/openjdk-bin.mk            |   4 +-
 .../14.0.2+12/0001-fix-gcc-10-support.patch   | 119 ------------------
 package/openjdk/Config.in                     |   2 +-
 package/openjdk/openjdk.hash                  |   2 +-
 package/openjdk/openjdk.mk                    |   4 +-
 6 files changed, 8 insertions(+), 127 deletions(-)
 delete mode 100644 package/openjdk/14.0.2+12/0001-fix-gcc-10-support.patch

diff --git a/package/openjdk-bin/openjdk-bin.hash b/package/openjdk-bin/openjdk-bin.hash
index a08aa16d47..04b3c42d25 100644
--- a/package/openjdk-bin/openjdk-bin.hash
+++ b/package/openjdk-bin/openjdk-bin.hash
@@ -1,5 +1,5 @@
-# From https://github.com/AdoptOpenJDK/openjdk14-binaries/releases
-sha256  7d5ee7e06909b8a99c0d029f512f67b092597aa5b0e78c109bd59405bbfa74fe  OpenJDK14U-jdk_x64_linux_hotspot_14.0.2_12.tar.gz
+# From https://github.com/AdoptOpenJDK/openjdk16-binaries/releases
+sha256  7fdda042207efcedd30cd76d6295ed56b9c2e248cb3682c50898a560d4aa1c6f  OpenJDK16U-jdk_x64_linux_hotspot_16.0.1_9.tar.gz
 
 # From https://github.com/AdoptOpenJDK/openjdk11-binaries/releases
 sha256  e99b98f851541202ab64401594901e583b764e368814320eba442095251e78cb  OpenJDK11U-jdk_x64_linux_hotspot_11.0.11_9.tar.gz
diff --git a/package/openjdk-bin/openjdk-bin.mk b/package/openjdk-bin/openjdk-bin.mk
index 2d8c018403..b48155dc28 100644
--- a/package/openjdk-bin/openjdk-bin.mk
+++ b/package/openjdk-bin/openjdk-bin.mk
@@ -5,8 +5,8 @@
 ################################################################################
 
 ifeq ($(BR2_OPENJDK_VERSION_LATEST),y)
-HOST_OPENJDK_BIN_VERSION_MAJOR = 14
-HOST_OPENJDK_BIN_VERSION_MINOR = 0.2_12
+HOST_OPENJDK_BIN_VERSION_MAJOR = 16
+HOST_OPENJDK_BIN_VERSION_MINOR = 0.1_9
 else
 HOST_OPENJDK_BIN_VERSION_MAJOR = 11
 HOST_OPENJDK_BIN_VERSION_MINOR = 0.11_9
diff --git a/package/openjdk/14.0.2+12/0001-fix-gcc-10-support.patch b/package/openjdk/14.0.2+12/0001-fix-gcc-10-support.patch
deleted file mode 100644
index 5364c47252..0000000000
--- a/package/openjdk/14.0.2+12/0001-fix-gcc-10-support.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-From 58911e9de888aece29f491995a8b8a31f7d6b424 Mon Sep 17 00:00:00 2001
-From: Patrick Zhang <patrick.zhang@amperecomputing.com>
-Date: Wed, 05 Feb 2020 17:14:15 -0700
-Subject: [PATCH] fix gcc 10 support
-
-This patch fixes the "multiple definition" link errors with GCC10 due to
-GCC10 setting -fno-common by default.
-
-This is a combination of the following upstream commits:
-  - https://hg.openjdk.java.net/jdk/jdk/rev/8e6fa89397ca
-  - https://hg.openjdk.java.net/jdk/jdk/rev/6925fca95959
-  - https://hg.openjdk.java.net/jdk/jdk/rev/9e54ea7d9cd9
-
-Signed-off-by: Patrick Zhang <patrick.zhang@amperecomputing.com>
-Signed-off-by: Adam Duskett <Aduskett@gmail.com>
----
- src/java.base/unix/native/libjava/childproc.c        |  1 +
- src/java.base/unix/native/libjava/childproc.h        |  2 +-
- .../share/native/libj2gss/NativeFunc.c               |  3 +++
- .../share/native/libj2gss/NativeFunc.h               |  2 +-
- src/jdk.sctp/unix/native/libsctp/Sctp.h              | 12 ++++++------
- src/jdk.sctp/unix/native/libsctp/SctpNet.c           |  7 +++++++
- 6 files changed, 19 insertions(+), 8 deletions(-)
-
-diff --git a/src/java.base/unix/native/libjava/childproc.c b/src/java.base/unix/native/libjava/childproc.c
-index 811aaeac5..16480bfbf 100644
---- a/src/java.base/unix/native/libjava/childproc.c
-+++ b/src/java.base/unix/native/libjava/childproc.c
-@@ -34,6 +34,7 @@
- 
- #include "childproc.h"
- 
-+const char * const *parentPathv;
- 
- ssize_t
- restartableWrite(int fd, const void *buf, size_t count)
-diff --git a/src/java.base/unix/native/libjava/childproc.h b/src/java.base/unix/native/libjava/childproc.h
-index 091150930..d57e44b6e 100644
---- a/src/java.base/unix/native/libjava/childproc.h
-+++ b/src/java.base/unix/native/libjava/childproc.h
-@@ -126,7 +126,7 @@ typedef struct _SpawnInfo {
-  * The cached and split version of the JDK's effective PATH.
-  * (We don't support putenv("PATH=...") in native code)
-  */
--const char * const *parentPathv;
-+extern const char * const *parentPathv;
- 
- ssize_t restartableWrite(int fd, const void *buf, size_t count);
- int restartableDup2(int fd_from, int fd_to);
-diff --git a/src/java.security.jgss/share/native/libj2gss/NativeFunc.c b/src/java.security.jgss/share/native/libj2gss/NativeFunc.c
-index da7bc0445..5941f7b5a 100644
---- a/src/java.security.jgss/share/native/libj2gss/NativeFunc.c
-+++ b/src/java.security.jgss/share/native/libj2gss/NativeFunc.c
-@@ -27,6 +27,9 @@
- #include <stdlib.h>
- #include "NativeFunc.h"
- 
-+/* global GSS function table */
-+GSS_FUNCTION_TABLE_PTR ftab;
-+
- /* standard GSS method names (ordering is from mapfile) */
- static const char RELEASE_NAME[]                = "gss_release_name";
- static const char IMPORT_NAME[]                 = "gss_import_name";
-diff --git a/src/java.security.jgss/share/native/libj2gss/NativeFunc.h b/src/java.security.jgss/share/native/libj2gss/NativeFunc.h
-index 82914387c..e4a4981a3 100644
---- a/src/java.security.jgss/share/native/libj2gss/NativeFunc.h
-+++ b/src/java.security.jgss/share/native/libj2gss/NativeFunc.h
-@@ -277,6 +277,6 @@ typedef struct GSS_FUNCTION_TABLE {
- typedef GSS_FUNCTION_TABLE *GSS_FUNCTION_TABLE_PTR;
- 
- /* global GSS function table */
--GSS_FUNCTION_TABLE_PTR ftab;
-+extern GSS_FUNCTION_TABLE_PTR ftab;
- 
- #endif
-diff --git a/src/jdk.sctp/unix/native/libsctp/Sctp.h b/src/jdk.sctp/unix/native/libsctp/Sctp.h
-index cc1367f78..46b07db0a 100644
---- a/src/jdk.sctp/unix/native/libsctp/Sctp.h
-+++ b/src/jdk.sctp/unix/native/libsctp/Sctp.h
-@@ -322,12 +322,12 @@ typedef int sctp_peeloff_func(int sock, sctp_assoc_t id);
- 
- #endif /* __linux__ */
- 
--sctp_getladdrs_func* nio_sctp_getladdrs;
--sctp_freeladdrs_func* nio_sctp_freeladdrs;
--sctp_getpaddrs_func* nio_sctp_getpaddrs;
--sctp_freepaddrs_func* nio_sctp_freepaddrs;
--sctp_bindx_func* nio_sctp_bindx;
--sctp_peeloff_func* nio_sctp_peeloff;
-+extern sctp_getladdrs_func* nio_sctp_getladdrs;
-+extern sctp_freeladdrs_func* nio_sctp_freeladdrs;
-+extern sctp_getpaddrs_func* nio_sctp_getpaddrs;
-+extern sctp_freepaddrs_func* nio_sctp_freepaddrs;
-+extern sctp_bindx_func* nio_sctp_bindx;
-+extern sctp_peeloff_func* nio_sctp_peeloff;
- 
- jboolean loadSocketExtensionFuncs(JNIEnv* env);
- 
-diff --git a/src/jdk.sctp/unix/native/libsctp/SctpNet.c b/src/jdk.sctp/unix/native/libsctp/SctpNet.c
-index d40c15aa3..ab9b6e093 100644
---- a/src/jdk.sctp/unix/native/libsctp/SctpNet.c
-+++ b/src/jdk.sctp/unix/native/libsctp/SctpNet.c
-@@ -43,6 +43,13 @@ static jmethodID isaCtrID = 0;
- static const char* nativeSctpLib = "libsctp.so.1";
- static jboolean funcsLoaded = JNI_FALSE;
- 
-+sctp_getladdrs_func* nio_sctp_getladdrs;
-+sctp_freeladdrs_func* nio_sctp_freeladdrs;
-+sctp_getpaddrs_func* nio_sctp_getpaddrs;
-+sctp_freepaddrs_func* nio_sctp_freepaddrs;
-+sctp_bindx_func* nio_sctp_bindx;
-+sctp_peeloff_func* nio_sctp_peeloff;
-+
- JNIEXPORT jint JNICALL DEF_JNI_OnLoad
-   (JavaVM *vm, void *reserved) {
-     return JNI_VERSION_1_2;
--- 
-2.26.2
-
diff --git a/package/openjdk/Config.in b/package/openjdk/Config.in
index 1b60d80dc2..f2b7f5ffd7 100644
--- a/package/openjdk/Config.in
+++ b/package/openjdk/Config.in
@@ -59,7 +59,7 @@ config BR2_OPENJDK_VERSION_LTS
 	bool "LTS (OpenJDK 11)"
 
 config BR2_OPENJDK_VERSION_LATEST
-	bool "latest (OpenJDK 14)"
+	bool "latest (OpenJDK 16)"
 
 endchoice
 
diff --git a/package/openjdk/openjdk.hash b/package/openjdk/openjdk.hash
index 35cd827d2d..a610099705 100644
--- a/package/openjdk/openjdk.hash
+++ b/package/openjdk/openjdk.hash
@@ -1,4 +1,4 @@
 # Locally computed
-sha256  582e3d805ab74582332250f95f9845608c8f3d3273aa92af6f683c45d1a4f8e8  jdk-14.0.2+12.tar.gz
+sha256  3b3aca61fe2834322e51636d99bcd09c4abba7d8a2cde231dbcbcbdedf829baf  jdk-16.0.1+9.tar.gz
 sha256  55841c01dbe6606e0d5f88045fb2da02632ce3a2d9d9b25d030a06eadeee0f62  jdk-11.0.11+9.tar.gz
 sha256  4b9abebc4338048a7c2dc184e9f800deb349366bdf28eb23c2677a77b4c87726  LICENSE
diff --git a/package/openjdk/openjdk.mk b/package/openjdk/openjdk.mk
index cda038805b..4f721988ea 100644
--- a/package/openjdk/openjdk.mk
+++ b/package/openjdk/openjdk.mk
@@ -5,8 +5,8 @@
 ################################################################################
 
 ifeq ($(BR2_OPENJDK_VERSION_LATEST),y)
-OPENJDK_VERSION_MAJOR = 14
-OPENJDK_VERSION_MINOR = 0.2+12
+OPENJDK_VERSION_MAJOR = 16
+OPENJDK_VERSION_MINOR = 0.1+9
 else
 OPENJDK_VERSION_MAJOR = 11
 OPENJDK_VERSION_MINOR = 0.11+9
-- 
2.31.1

^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [Buildroot] [PATCH v2 1/3] testing/tests/package/test_openjdk.py: bump kernel version to 5.10.34
  2021-05-04 21:00 [Buildroot] [PATCH v2 1/3] testing/tests/package/test_openjdk.py: bump kernel version to 5.10.34 Adam Duskett
  2021-05-04 21:00 ` [Buildroot] [PATCH v2 2/3] package/openjdk: Change URL to Github Adam Duskett
  2021-05-04 21:00 ` [Buildroot] [PATCH v2 3/3] package/openjdk{, -bin}: bump latest to version 16.0.1+9 Adam Duskett
@ 2021-05-05 19:37 ` Yann E. MORIN
  2021-05-08 14:15 ` Peter Korsgaard
  3 siblings, 0 replies; 8+ messages in thread
From: Yann E. MORIN @ 2021-05-05 19:37 UTC (permalink / raw)
  To: buildroot

Adam, All,

On 2021-05-04 14:00 -0700, Adam Duskett spake thusly:
> Kernel 4.16.7 is old enough to produce the "multiple definition of `yylloc'"
> error which is fixed in newer versions.
> 
> Bump the test kernel version from 4.16.7 to 5.10.34 to prevent this error wwhen
> building the test image.
> 
> Signed-off-by: Adam Duskett <aduskett@gmail.com>

Applied to master, thanks.

Regards,
Yann E. MORIN.

> ---
>  support/testing/tests/package/test_openjdk.py | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/support/testing/tests/package/test_openjdk.py b/support/testing/tests/package/test_openjdk.py
> index 3a1d1a9b09..26b7f9ee92 100644
> --- a/support/testing/tests/package/test_openjdk.py
> +++ b/support/testing/tests/package/test_openjdk.py
> @@ -12,7 +12,7 @@ class TestOpenJdk(infra.basetest.BRTest):
>          BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0"
>          BR2_LINUX_KERNEL=y
>          BR2_LINUX_KERNEL_CUSTOM_VERSION=y
> -        BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.7"
> +        BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.34"
>          BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
>          BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config"
>          BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
> -- 
> 2.31.1
> 
> _______________________________________________
> 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.  |
'------------------------------^-------^------------------^--------------------'

^ permalink raw reply	[flat|nested] 8+ messages in thread

* [Buildroot] [PATCH v2 1/3] testing/tests/package/test_openjdk.py: bump kernel version to 5.10.34
  2021-05-04 21:00 [Buildroot] [PATCH v2 1/3] testing/tests/package/test_openjdk.py: bump kernel version to 5.10.34 Adam Duskett
                   ` (2 preceding siblings ...)
  2021-05-05 19:37 ` [Buildroot] [PATCH v2 1/3] testing/tests/package/test_openjdk.py: bump kernel version to 5.10.34 Yann E. MORIN
@ 2021-05-08 14:15 ` Peter Korsgaard
  3 siblings, 0 replies; 8+ messages in thread
From: Peter Korsgaard @ 2021-05-08 14:15 UTC (permalink / raw)
  To: buildroot

>>>>> "Adam" == Adam Duskett <aduskett@gmail.com> writes:

 > Kernel 4.16.7 is old enough to produce the "multiple definition of `yylloc'"
 > error which is fixed in newer versions.

 > Bump the test kernel version from 4.16.7 to 5.10.34 to prevent this error wwhen
 > building the test image.

 > Signed-off-by: Adam Duskett <aduskett@gmail.com>

Committed to 2021.02.x, thanks.

-- 
Bye, Peter Korsgaard

^ permalink raw reply	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2021-05-08 14:15 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-05-04 21:00 [Buildroot] [PATCH v2 1/3] testing/tests/package/test_openjdk.py: bump kernel version to 5.10.34 Adam Duskett
2021-05-04 21:00 ` [Buildroot] [PATCH v2 2/3] package/openjdk: Change URL to Github Adam Duskett
2021-05-05 20:38   ` Yann E. MORIN
2021-05-06  6:53     ` Arnout Vandecappelle
2021-05-06 19:46       ` Yann E. MORIN
2021-05-04 21:00 ` [Buildroot] [PATCH v2 3/3] package/openjdk{, -bin}: bump latest to version 16.0.1+9 Adam Duskett
2021-05-05 19:37 ` [Buildroot] [PATCH v2 1/3] testing/tests/package/test_openjdk.py: bump kernel version to 5.10.34 Yann E. MORIN
2021-05-08 14:15 ` Peter Korsgaard

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox