From 3fe6fa660b9dbb8f0f1e9e3cea61474e61543062 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Sat, 5 Nov 2011 01:03:14 +0100
Subject: [PATCH] eglibc: install libs which are not needed for initramfs to
 /usr/lib, install tools to /usr/bin

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/toolchain/devel/eglibc/install | 31 ++++++++++++++-----------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/packages/toolchain/devel/eglibc/install b/packages/toolchain/devel/eglibc/install
index 97d5936204..2fac3902b9 100755
--- a/packages/toolchain/devel/eglibc/install
+++ b/packages/toolchain/devel/eglibc/install
@@ -25,25 +25,28 @@
 mkdir -p $INSTALL/lib
   cp $PKG_BUILD/objdir-$1/elf/ld*.so.* $INSTALL/lib
   cp $PKG_BUILD/objdir-$1/libc.so.6 $INSTALL/lib
-  cp $PKG_BUILD/objdir-$1/dlfcn/libdl.so.2 $INSTALL/lib
-  cp $PKG_BUILD/objdir-$1/nptl/libpthread.so.0 $INSTALL/lib
   cp $PKG_BUILD/objdir-$1/math/libm.so.6 $INSTALL/lib
-  cp $PKG_BUILD/objdir-$1/login/libutil.so.1 $INSTALL/lib # e.g. for utmp support, needed by PAM_filter
-  cp $PKG_BUILD/objdir-$1/rt/librt.so.1 $INSTALL/lib
-  cp $PKG_BUILD/objdir-$1/resolv/libnss_dns.so.2 $INSTALL/lib
-  cp $PKG_BUILD/objdir-$1/nis/libnsl.so.1 $INSTALL/lib
-  cp $PKG_BUILD/objdir-$1/nis/libnss_compat.so.2 $INSTALL/lib
-  cp $PKG_BUILD/objdir-$1/nss/libnss_files.so.2 $INSTALL/lib
-  cp $PKG_BUILD/objdir-$1/crypt/libcrypt.so.1 $INSTALL/lib
-  cp $PKG_BUILD/objdir-$1/resolv/libresolv.so.2 $INSTALL/lib
+
+mkdir -p $INSTALL/usr/lib
+  cp $PKG_BUILD/objdir-$1/crypt/libcrypt.so.1 $INSTALL/usr/lib
+  cp $PKG_BUILD/objdir-$1/dlfcn/libdl.so.2 $INSTALL/usr/lib
+  cp $PKG_BUILD/objdir-$1/nis/libnsl.so.1 $INSTALL/usr/lib
+  cp $PKG_BUILD/objdir-$1/nis/libnss_compat.so.2 $INSTALL/usr/lib
+  cp $PKG_BUILD/objdir-$1/nss/libnss_files.so.2 $INSTALL/usr/lib
+  cp $PKG_BUILD/objdir-$1/resolv/libnss_dns.so.2 $INSTALL/usr/lib
+  cp $PKG_BUILD/objdir-$1/resolv/libresolv.so.2 $INSTALL/usr/lib
+  cp $PKG_BUILD/objdir-$1/rt/librt.so.1 $INSTALL/usr/lib
+  cp $PKG_BUILD/objdir-$1/nptl/libpthread.so.0 $INSTALL/usr/lib
+  cp $PKG_BUILD/objdir-$1/login/libutil.so.1 $INSTALL/usr/lib # e.g. for utmp support, needed by PAM_filter
+
 
   [ "$DEVTOOLS" = yes ] && cp $PKG_BUILD/objdir-$1/nptl_db/libthread_db.so.1 $INSTALL/lib # for GDB
 
-mkdir -p $INSTALL/bin
-  cp $PKG_BUILD/objdir-$1/elf/ldd $INSTALL/bin
-  sed -i 's%bash%sh%g' $INSTALL/bin/ldd
+mkdir -p $INSTALL/usr/bin
+  cp $PKG_BUILD/objdir-$1/elf/ldd $INSTALL/usr/bin
+  sed -i 's%bash%sh%g' $INSTALL/usr/bin/ldd
 
-  cp $PKG_BUILD/objdir-$1/locale/locale $INSTALL/bin
+  cp $PKG_BUILD/objdir-$1/locale/locale $INSTALL/usr/bin
 
 # libiconv replacement:
 #  mkdir -p $INSTALL/usr/lib/gconv