]> git.pld-linux.org Git - projects/geninitrd.git/commitdiff
fix for r12426 breaking inst_exec of multiple files
authorElan Ruusamäe <glen@pld-linux.org>
Wed, 14 Mar 2012 20:11:23 +0000 (20:11 +0000)
committerElan Ruusamäe <glen@pld-linux.org>
Wed, 14 Mar 2012 20:11:23 +0000 (20:11 +0000)
svn-id: @12488

geninitrd

index f050c457b81f94d8489edb1ed1173a2d9de75a31..296ac479bf066e9cc901f43a9365f5641ea2c6b8 100755 (executable)
--- a/geninitrd
+++ b/geninitrd
@@ -434,15 +434,18 @@ inst_exec() {
 
        local obj lib libs
        for obj in "$@"; do
-               if [ "$obj" != "/lib/ld-linux.so.2" ] && [ "$obj" != "/lib64/ld-linux-x86-64.so.2" ]; then
-                       libs=$(ldd "$obj" | awk '/statically|linux-(gate|vdso)\.so/{next} NF == 2 {print $1} /=/{print $3}' | sort -u)
-               fi
-       done
-       for lib in $libs; do
-               if [ ! -f "$DESTDIR/$_lib/${lib##*/}" ]; then
-                       inst_d /$_lib
-                       inst_exec $lib /$_lib
-               fi
+               case "$obj" in
+                       /lib/ld-linux.so.2 | /lib64/ld-linux-x86-64.so.2)
+                       continue
+               esac
+
+               libs=$(ldd "$obj" | awk '/statically|linux-(gate|vdso)\.so/{next} NF == 2 {print $1} /=/{print $3}' | sort -u)
+               for lib in $libs; do
+                       if [ ! -f "$DESTDIR/$_lib/${lib##*/}" ]; then
+                               inst_d /$_lib
+                               inst_exec $lib /$_lib
+                       fi
+               done
        done
 
        # hack for uclibc linked binaries requiring this fixed path
This page took 0.170701 seconds and 4 git commands to generate.