Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

improvement: provide extra package for jre-native and jdk, jdk-native #57

Open
wants to merge 2 commits into
base: scarthgap
Choose a base branch
from
Open

improvement: provide extra package for jre-native and jdk, jdk-native #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
10a771c
feat: provide OpenJDK JDK and JDK native
GeVa2072 Nov 28, 2024
41622cc
fix: replace ${libdir}/jvm/${BPN} by ${libdir_jvm}
GeVa2072 Nov 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions recipes-core/openjdk-21/openjdk-21-jdk-native_21.0.4+7.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
require openjdk-21.inc
require openjdk-21-jdk.inc
inherit native

do_install() {
install -d ${D}${libdir_jvm}
cp -R --no-dereference --preserve=mode,links -v ${S}/* ${D}${libdir_jvm}
}

7 changes: 7 additions & 0 deletions recipes-core/openjdk-21/openjdk-21-jdk.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
SUMMARY = "Prebuilt OpenJDK JDK for Java 21 offered by Adoptium."
JVM_CHECKSUM:aarch64 = "d768eecddd7a515711659e02caef8516b7b7177fa34880a56398fd9822593a79"
JVM_CHECKSUM:x86-64 = "51fb4d03a4429c39d397d3a03a779077159317616550e4e71624c9843083e7b9"
JVM_CHECKSUM:riscv64 = "b04fd7f52d18268a935f1a7144dae802b25db600ec97156ddd46b3100cbd13da"

API_IMAGE_TYPE = "jdk"

3 changes: 3 additions & 0 deletions recipes-core/openjdk-21/openjdk-21-jdk_21.0.4+7.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
require openjdk-21.inc
require openjdk-21-jdk.inc

9 changes: 9 additions & 0 deletions recipes-core/openjdk-21/openjdk-21-jre_21.0.4+7.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
require openjdk-21.inc
SUMMARY = "Prebuilt OpenJDK JRE for Java 21 offered by Adoptium."

JVM_CHECKSUM:aarch64 = "58845ce4275f3ec74fba075597c8216bb201773da036c4703be8b7b7b457355d"
JVM_CHECKSUM:x86-64 = "d3affbb011ca6c722948f6345d15eba09bded33f9947d4d67e09723e2518c12a"
JVM_CHECKSUM:riscv64 = "bf814344429f53d11f8aace14d326e2580ea6e66dd81b109c79160bd41735237"

API_IMAGE_TYPE = "jre"

23 changes: 11 additions & 12 deletions ...openjdk-21-jre/openjdk-21-jre_21.0.4+7.bb → recipes-core/openjdk-21/openjdk-21.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
SUMMARY = "Prebuilt OpenJDK JRE for Java 21 offered by Adoptium."
HOMEPAGE = "https://adoptium.net"
LICENSE = "GPL-2.0-with-classpath-exception"
LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0-with-classpath-exception;md5=6133e6794362eff6641708cfcc075b80"
COMPATIBLE_HOST = "(x86_64|aarch64|riscv64).*-linux"
DEPENDS = "patchelf-native"

JVM_CHECKSUM:aarch64 = "58845ce4275f3ec74fba075597c8216bb201773da036c4703be8b7b7b457355d"
JVM_RDEPENDS:aarch64 = " \
alsa-lib (>= 0.9) \
freetype (>= 2.13) \
Expand All @@ -17,7 +15,7 @@ JVM_RDEPENDS:aarch64 = " \
libxtst (>= 1.2) \
zlib (>= 1.1.4) \
"
JVM_CHECKSUM:x86-64 = "d3affbb011ca6c722948f6345d15eba09bded33f9947d4d67e09723e2518c12a"

JVM_RDEPENDS:x86-64 = " \
alsa-lib (>= 0.9) \
freetype (>= 2.13) \
Expand All @@ -29,7 +27,7 @@ JVM_RDEPENDS:x86-64 = " \
libxtst (>= 1.2) \
zlib (>= 1.1.4) \
"
JVM_CHECKSUM:riscv64 = "bf814344429f53d11f8aace14d326e2580ea6e66dd81b109c79160bd41735237"

JVM_RDEPENDS:riscv64 = " \
alsa-lib (>= 0.9) \
freetype (>= 2.13) \
Expand All @@ -49,7 +47,6 @@ API_OS = "linux"
API_ARCH:aarch64 = "aarch64"
API_ARCH:x86-64 = "x64"
API_ARCH:riscv64 = "riscv64"
API_IMAGE_TYPE = "jre"
API_JVM_IMPL = "hotspot"
API_HEAP_SIZE ?= "normal"
API_VENDOR = "eclipse"
Expand All @@ -63,10 +60,11 @@ python () {
import re
d.setVar('ADAPTED_PV_SRC', d.getVar('PV').replace('+', '_'))
}

SRC_URI:append = " https://github.com/adoptium/temurin21-binaries/releases/download/${API_RELEASE_NAME}/OpenJDK21U-jdk-sources_${ADAPTED_PV_SRC}.tar.gz;name=sources;downloadfilename=${BPN}-sources-${PV}.tar.gz;unpack=false"
SRC_URI[sources.sha256sum] = "ba38841876aeec064b1f0d723117908b25b3961685b9801942c707e5e9bd47d1"

libdir_jre = "${libdir}/jvm/openjdk-21-jre"
libdir_jvm = "${libdir}/jvm/${BPN}"

# Prevent the packaging task from stripping out
# debugging symbols, since there are none.
Expand All @@ -85,24 +83,25 @@ INSANE_SKIP:${PN}:append = " dev-so"
do_configure[noexec] = "1"
do_compile[noexec] = "1"
do_install() {
install -d ${D}${libdir_jre}
cp -R --no-dereference --preserve=mode,links -v ${S}/* ${D}${libdir_jre}
install -d ${D}${libdir_jvm}
cp -R --no-dereference --preserve=mode,links -v ${S}/* ${D}${libdir_jvm}

LDLINUX=$(basename $(ls -1 ${RECIPE_SYSROOT}${base_libdir}/ld-linux* | sort | head -n1))
if [ -n "$LDLINUX" ]; then
for i in ${D}${libdir}/jvm/${BPN}/bin/* ; do
for i in ${D}${libdir_jvm}/bin/* ; do
patchelf --set-interpreter ${base_libdir}/$LDLINUX $i
done
fi
}

RPROVIDES:${PN} = "java2-runtime"
FILES:${PN} = "${libdir_jre}"
FILES:${PN} = "${libdir_jvm}"

inherit update-alternatives
ALTERNATIVE_PRIORITY = "100"
ALTERNATIVE:${PN} = "java keytool"
ALTERNATIVE_LINK_NAME[java] = "${bindir}/java"
ALTERNATIVE_TARGET[java] = "${libdir_jre}/bin/java"
ALTERNATIVE_TARGET[java] = "${libdir_jvm}/bin/java"
ALTERNATIVE_LINK_NAME[keytool] = "${bindir}/keytool"
ALTERNATIVE_TARGET[keytool] = "${libdir_jre}/bin/keytool"
ALTERNATIVE_TARGET[keytool] = "${libdir_jvm}/bin/keytool"

Loading