From ab82aff3072b274dec808974d800f75bdeb5be55 Mon Sep 17 00:00:00 2001 From: Geoffroy Van Elsuve Date: Tue, 26 Nov 2024 12:13:24 +0100 Subject: [PATCH] Fix usage of ${libdir}/jvm/${BPN} instead of ${libdir_jre} in OpenJDK 8 Signed-off-by: Geoffroy Van Elsuve --- recipes-core/openjdk-8-jre/openjdk-8-jre_8u422-b05.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-core/openjdk-8-jre/openjdk-8-jre_8u422-b05.bb b/recipes-core/openjdk-8-jre/openjdk-8-jre_8u422-b05.bb index 88bd198..7f2c994 100644 --- a/recipes-core/openjdk-8-jre/openjdk-8-jre_8u422-b05.bb +++ b/recipes-core/openjdk-8-jre/openjdk-8-jre_8u422-b05.bb @@ -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. @@ -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