From e9e51d531834def29daf4749625743a2df4b3e00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= Date: Sun, 24 Sep 2023 16:35:13 +0100 Subject: [PATCH] Mark openjdk 18-21 ebuilds stable on arm64. --- README.md | 6 +++--- dev-java/openjdk/Manifest | 8 ++++---- dev-java/openjdk/openjdk-18.0.2_p05.ebuild | 2 +- dev-java/openjdk/openjdk-19.0.2_p07.ebuild | 2 +- dev-java/openjdk/openjdk-20.0.2_p09.ebuild | 2 +- dev-java/openjdk/openjdk-21.0.0_p35.ebuild | 14 +++++--------- 6 files changed, 15 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index b7dc5a8..54a19b1 100644 --- a/README.md +++ b/README.md @@ -13,14 +13,14 @@ with ant-core:0 from the Gentoo tree. and might need additional patches. -## Bootstrapping OpenJDK 11 +## Bootstrapping OpenJDK 17 ```sh -sudo emerge -a1v =dev-java/openjdk-11.0.9_p11 +sudo emerge -a1v =dev-java/openjdk-17.0.0_p35 ``` At this point you can remove this overlay and install OpenJDK from main tree: ```sh -sudo emerge -a dev-java/openjdk:11 +sudo emerge -a dev-java/openjdk:17 ``` ## Bootstrapping story diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest index ee85ed8..db971de 100644 --- a/dev-java/openjdk/Manifest +++ b/dev-java/openjdk/Manifest @@ -115,10 +115,10 @@ EBUILD openjdk-14.0.2_p01.ebuild 8298 BLAKE2B 50baebff02087e9572ba0f9b66c7063276 EBUILD openjdk-15.0.0_p36.ebuild 8530 BLAKE2B 87603ce71c6074b1037066ce698fb28e2f8052641c895c72c321e65c7809ba9e969fa79794b3cb2d0fba959d1e9c57d03b54cd4c34fc062cbc6965233e1a14d9 SHA512 ad08ad88bf287d94f2617fd2f73e5dbc678791a67b273532155c181393dffa587e48cfcdaef95c99b7f5c6d82e7dc4cc64c123771dee4d2daa3554dc9b55c86f EBUILD openjdk-16.0.0_p36.ebuild 8348 BLAKE2B 9bb4fbde967017709c252ccae3bab0d308f4189456218e29960f3b0e2b31fb7e3569915f5c932f6c294417bc08aed64ca9f7de9fb3f6bb97c92541d4962e1148 SHA512 544c2b996b79aee0c08fa4a985076f7965d803f1ebf3de95e295c1c35c6c0c707a4d5152559b838696321809e270c65a4a8d78a813c9ea99dc52b75bf3f56e17 EBUILD openjdk-17.0.0_p35.ebuild 8350 BLAKE2B 7dd8c922cb389cfd95aafe140692cb267cfca39b3a3634058605cc9bacd822fb4ba8d4bf1242c18de311d9d310e544d074db821ecfc8e3a5335082e3be083228 SHA512 36ebe391d81a1cb9abe0ba2dcc8645d808bb18745e316857dbd219aee3533a7c7b2d69785686907cc9ffae6725ced7adac81eca8f43aa907c54605cdb3007403 -EBUILD openjdk-18.0.2_p05.ebuild 8631 BLAKE2B f3fb02b69de5eedcf63dcef41cd75571de31bde5faddd84cba1acd974c843483ccfb2ff11b988d73744cfb54da96d5628c7ab440b896336e2e4d9c8414c5abda SHA512 cefecd7ebc30d5c82eddccb6ff899fe8a2c71a4b7cd4032cdee8c96250405043808a8c8bebd9711eee0d2a1e5ecfa92a2925fec0ebe512935b41cc0f61010306 -EBUILD openjdk-19.0.2_p07.ebuild 8631 BLAKE2B f3fb02b69de5eedcf63dcef41cd75571de31bde5faddd84cba1acd974c843483ccfb2ff11b988d73744cfb54da96d5628c7ab440b896336e2e4d9c8414c5abda SHA512 cefecd7ebc30d5c82eddccb6ff899fe8a2c71a4b7cd4032cdee8c96250405043808a8c8bebd9711eee0d2a1e5ecfa92a2925fec0ebe512935b41cc0f61010306 -EBUILD openjdk-20.0.2_p09.ebuild 8631 BLAKE2B f3fb02b69de5eedcf63dcef41cd75571de31bde5faddd84cba1acd974c843483ccfb2ff11b988d73744cfb54da96d5628c7ab440b896336e2e4d9c8414c5abda SHA512 cefecd7ebc30d5c82eddccb6ff899fe8a2c71a4b7cd4032cdee8c96250405043808a8c8bebd9711eee0d2a1e5ecfa92a2925fec0ebe512935b41cc0f61010306 -EBUILD openjdk-21.0.0_p35.ebuild 8635 BLAKE2B d67baa2215981d5d904b189b0008c101d326b1fad1287b92b534e63d7fddf205d2a84822da9f4cf72fc1f66c18276bb6f9d3998ac028238e1cf053581090dc32 SHA512 489e84670d82fcab3872ae526f847ab0b08e9cac8dd317b4ba7095789dc8bc4d0888d2a4bf47b63574c49a87aa5c2f530fb6df7edd20cce7619de1c9b3d81204 +EBUILD openjdk-18.0.2_p05.ebuild 8630 BLAKE2B 3e4385bcc178539bf30034c286cb037dd00ca3c5fd12b06b10e172d291170c2589b0a6059b2a89b5a25273804a1322ae4a056481a098b4e7b3216643f5fbcd8a SHA512 fe34d95bbf704dc01860bb17f7e8c0e5c6588b8fd3382f2b7f3be908e1c5294521033747d0f4d2a8a3a0e41b470ab3394337e6dd99592a5bb10d63246fad392e +EBUILD openjdk-19.0.2_p07.ebuild 8630 BLAKE2B 3e4385bcc178539bf30034c286cb037dd00ca3c5fd12b06b10e172d291170c2589b0a6059b2a89b5a25273804a1322ae4a056481a098b4e7b3216643f5fbcd8a SHA512 fe34d95bbf704dc01860bb17f7e8c0e5c6588b8fd3382f2b7f3be908e1c5294521033747d0f4d2a8a3a0e41b470ab3394337e6dd99592a5bb10d63246fad392e +EBUILD openjdk-20.0.2_p09.ebuild 8630 BLAKE2B 3e4385bcc178539bf30034c286cb037dd00ca3c5fd12b06b10e172d291170c2589b0a6059b2a89b5a25273804a1322ae4a056481a098b4e7b3216643f5fbcd8a SHA512 fe34d95bbf704dc01860bb17f7e8c0e5c6588b8fd3382f2b7f3be908e1c5294521033747d0f4d2a8a3a0e41b470ab3394337e6dd99592a5bb10d63246fad392e +EBUILD openjdk-21.0.0_p35.ebuild 8380 BLAKE2B a86260ac28d99a4b6b9f5a1ce62cbde3cc9eb17a1da87c39ba92a0a15a0f485abb6daaccb0287985c5c8444747bf554d1be7296309c08e5c2da63c7991e143a3 SHA512 06eaba75db2847373141ebb5754f2c838de32720bbe0b037de82708ad6337157f772b987305d6df94f4c19d4f40f76ff60e2e65dffcdcfd5e80048f0d1ad87d5 EBUILD openjdk-8.272_p10.ebuild 8076 BLAKE2B fab8d8c50433428a8aa063e978009e899721ff6b3aa17e868ddabdd688d55b447d0064284f3b63a6580545586dd4c28a37c60095ab257d52408b1c65983a205e SHA512 610c0397a8c6e258e5be91239cacd1d3d00b48c839cb54cb2990f41614e86299c87bb39d97518532e1e875dbee9bcc03e2e6e89372690731e3bf35e379eb3d6d EBUILD openjdk-9.0.4_p12.ebuild 8296 BLAKE2B 79b6a13687e067d1a00066857cd88ee167deec0a37c6772f799e04aea46a95558617472916bcc4f3662d45a45607a39ad15a895f31637c384868ceacc21bdb5c SHA512 d80d10008de8e24c12dc05419c8ce9c549ee15ce53cf25370e1922969cdf89905af89507105c4f9ab9cd3b2077ac4624322f4bfa3d0609182bf628b4e842b1d7 MISC metadata.xml 1432 BLAKE2B 36a11642c99127a5f97fc0b095a142705c6b4e077ed24604f1886e4d1beaa47b4fa30359600797d5e6a085befd11a2851196fe97a75a0f0907461679946b4cbf SHA512 ecc66015da3a0fc616b91dd5aaffb5b050c9f66e936cad02ec12fb56dd7c6b3b3c331d8856402c0deee16c415ea083e088cce7414703f9d659f551883b055ff0 diff --git a/dev-java/openjdk/openjdk-18.0.2_p05.ebuild b/dev-java/openjdk/openjdk-18.0.2_p05.ebuild index 1337f9d..dc06114 100644 --- a/dev-java/openjdk/openjdk-18.0.2_p05.ebuild +++ b/dev-java/openjdk/openjdk-18.0.2_p05.ebuild @@ -25,7 +25,7 @@ SRC_URI=" # https://raw.githubusercontent.com/felixonmars/archriscv-packages/master/java17-openjdk/java17-riscv64.patch LICENSE="GPL-2-with-classpath-exception" -KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv ~x86" IUSE="alsa big-endian cups debug doc examples headless-awt javafx +jbootstrap lto selinux source +system-bootstrap systemtap" diff --git a/dev-java/openjdk/openjdk-19.0.2_p07.ebuild b/dev-java/openjdk/openjdk-19.0.2_p07.ebuild index 1337f9d..dc06114 100644 --- a/dev-java/openjdk/openjdk-19.0.2_p07.ebuild +++ b/dev-java/openjdk/openjdk-19.0.2_p07.ebuild @@ -25,7 +25,7 @@ SRC_URI=" # https://raw.githubusercontent.com/felixonmars/archriscv-packages/master/java17-openjdk/java17-riscv64.patch LICENSE="GPL-2-with-classpath-exception" -KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv ~x86" IUSE="alsa big-endian cups debug doc examples headless-awt javafx +jbootstrap lto selinux source +system-bootstrap systemtap" diff --git a/dev-java/openjdk/openjdk-20.0.2_p09.ebuild b/dev-java/openjdk/openjdk-20.0.2_p09.ebuild index 1337f9d..dc06114 100644 --- a/dev-java/openjdk/openjdk-20.0.2_p09.ebuild +++ b/dev-java/openjdk/openjdk-20.0.2_p09.ebuild @@ -25,7 +25,7 @@ SRC_URI=" # https://raw.githubusercontent.com/felixonmars/archriscv-packages/master/java17-openjdk/java17-riscv64.patch LICENSE="GPL-2-with-classpath-exception" -KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv ~x86" IUSE="alsa big-endian cups debug doc examples headless-awt javafx +jbootstrap lto selinux source +system-bootstrap systemtap" diff --git a/dev-java/openjdk/openjdk-21.0.0_p35.ebuild b/dev-java/openjdk/openjdk-21.0.0_p35.ebuild index 1e1c987..7d5128a 100644 --- a/dev-java/openjdk/openjdk-21.0.0_p35.ebuild +++ b/dev-java/openjdk/openjdk-21.0.0_p35.ebuild @@ -5,14 +5,10 @@ EAPI=7 inherit check-reqs eapi8-dosym flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs -# don't change versioning scheme -# to find correct _p number, look at -# https://github.com/openjdk/jdk${SLOT}u/tags -# you will see, for example, jdk-17.0.4.1-ga and jdk-17.0.4.1+1, both point -# to exact same commit sha. we should always use the full version. -# -ga tag is just for humans to easily identify General Availability release tag. -MY_PV="${PV%.0.0_p*}-ga" -SLOT="${MY_PV%%[-+]*}" +MY_PV="${PV/_p/+}" +FULL_VERSION="${PV%_p*}" +SLOT=$(ver_cut 1) +# First release of major jdk releases do not contain u at end jdk. DESCRIPTION="Open source implementation of the Java programming language" HOMEPAGE="https://openjdk.org" @@ -25,7 +21,7 @@ SRC_URI=" # https://raw.githubusercontent.com/felixonmars/archriscv-packages/master/java17-openjdk/java17-riscv64.patch LICENSE="GPL-2-with-classpath-exception" -KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv ~x86" IUSE="alsa big-endian cups debug doc examples headless-awt javafx +jbootstrap lto selinux source +system-bootstrap systemtap"