Make sure s390 gets /lib/ld64.so.1

If s390 images lack /lib/ld64.so.1, nothing works.

2 files changed, 10 insertions, 0 deletions

diff --git a/scripts/buildinstall.functions b/scripts/buildinstall.functions
index e978bf56b..3b10dffde 100755
--- a/scripts/buildinstall.functions
+++ b/scripts/buildinstall.functions
@@ -85,6 +85,11 @@ EOF
     for l in $(/usr/sbin/chroot $root find /$LDSODIR -maxdepth 1 -type l -name ld*.so*); do
        [ "$(/usr/sbin/chroot $root readlink -f $l)" == "$LDSO" ] && DSO_DEPS="$DSO_DEPS $l"
     done
+    if [ "$(uname -m)" == "s390x" ]; then
+       for l in $(/usr/sbin/chroot $root find /lib -maxdepth 1 -type 1 -name ld*.so*); do
+          [ "$(/usr/sbin/chroot $root readlink -f $l)" == "$LDSO" ] && DSO_DEPS="$DSO_DEPS $l"
+       done
+    fi
 
     [ -n "$DEBUG" ] && echo "DSO_DEPS for $bin are $DSO_DEPS"
 }
diff --git a/scripts/mk-images b/scripts/mk-images
index f746a290c..44b430db0 100755
--- a/scripts/mk-images
+++ b/scripts/mk-images
@@ -396,6 +396,11 @@ instbin() {
                 ln -s $linker ld-linux.so.2
             fi
             popd
+            if [ "$BUILDARCH" = "s390x" ]; then
+                pushd $DIR/lib
+                ln -s ../$LIBDIR/ld64.so.1
+                popd
+            fi
         fi
     fi
 }