Skip to content

Commit

Permalink
Fix usage of ${libdir}/jvm/${BPN} instead of ${libdir_jre} in OpenJDK 8
Browse files Browse the repository at this point in the history
Signed-off-by: Geoffroy Van Elsuve <[email protected]>
  • Loading branch information
GeVa2072 authored and sebveit committed Nov 26, 2024
1 parent 94cd6f1 commit ab82aff
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions recipes-core/openjdk-8-jre/openjdk-8-jre_8u422-b05.bb
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ python () {
SRC_URI:append = " https://github.com/adoptium/temurin8-binaries/releases/download/${API_RELEASE_NAME}/OpenJDK8U-jdk-sources_${ADAPTED_PV_SRC}.tar.gz;name=sources;downloadfilename=${BPN}-sources-${PV}.tar.gz;unpack=false"
SRC_URI[sources.sha256sum] = "ed95a098f1036b1300d6a6470f77b3445c02d2994e4d6ef8ef991183129cda80"

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

# Prevent the packaging task from stripping out
# debugging symbols, since there are none.
Expand All @@ -94,7 +94,7 @@ do_install() {

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_jre}/bin/* ; do
patchelf --set-interpreter ${base_libdir}/$LDLINUX $i
done
fi
Expand Down

0 comments on commit ab82aff

Please sign in to comment.