recipes-core: Expands the search for the linker in JRE recipes

Some system setups save their linker under file names like ld-linux.so.2. This won't be recognized by the current search for the linker. Signed-off-by: Sebastian Veit <[email protected]>
lucimber · Apr 11, 2024 · f0255a2 · f0255a2
1 parent b1d8aa4
commit f0255a2
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/recipes-core/openjdk-11-jre/openjdk-11-jre_11.0.22+7.bb b/recipes-core/openjdk-11-jre/openjdk-11-jre_11.0.22+7.bb
@@ -83,7 +83,7 @@ do_install() {
   install -d ${D}${libdir_jre}
   cp -R --no-dereference --preserve=mode,links -v ${S}/* ${D}${libdir_jre}
 
-  LDLINUX=$(basename $(ls -1 ${RECIPE_SYSROOT}${base_libdir}/ld-linux-* | sort | head -n1))
+  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
       patchelf --set-interpreter ${base_libdir}/$LDLINUX $i

diff --git a/recipes-core/openjdk-17-jre/openjdk-17-jre_17.0.10+7.bb b/recipes-core/openjdk-17-jre/openjdk-17-jre_17.0.10+7.bb
@@ -83,7 +83,7 @@ do_install() {
   install -d ${D}${libdir_jre}
   cp -R --no-dereference --preserve=mode,links -v ${S}/* ${D}${libdir_jre}
 
-  LDLINUX=$(basename $(ls -1 ${RECIPE_SYSROOT}${base_libdir}/ld-linux-* | sort | head -n1))
+  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
       patchelf --set-interpreter ${base_libdir}/$LDLINUX $i

diff --git a/recipes-core/openjdk-21-jre/openjdk-21-jre_21.0.2+13.bb b/recipes-core/openjdk-21-jre/openjdk-21-jre_21.0.2+13.bb
@@ -69,7 +69,7 @@ do_install() {
   install -d ${D}${libdir_jre}
   cp -R --no-dereference --preserve=mode,links -v ${S}/* ${D}${libdir_jre}
 
-  LDLINUX=$(basename $(ls -1 ${RECIPE_SYSROOT}${base_libdir}/ld-linux-* | sort | head -n1))
+  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
       patchelf --set-interpreter ${base_libdir}/$LDLINUX $i

diff --git a/recipes-core/openjdk-8-jre/openjdk-8-jre_8u402-b06.bb b/recipes-core/openjdk-8-jre/openjdk-8-jre_8u402-b06.bb
@@ -83,7 +83,7 @@ do_install() {
   install -d ${D}${libdir_jre}
   cp -R --no-dereference --preserve=mode,links -v ${S}/* ${D}${libdir_jre}
 
-  LDLINUX=$(basename $(ls -1 ${RECIPE_SYSROOT}${base_libdir}/ld-linux-* | sort | head -n1))
+  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
       patchelf --set-interpreter ${base_libdir}/$LDLINUX $i