SVN: geninitrd/trunk/geninitrd

[glen]

Author: glen
Date: Wed Mar 14 21:11:23 2012
New Revision: 12488

Modified:
   geninitrd/trunk/geninitrd
Log:
fix for r12426 breaking inst_exec of multiple files


Modified: geninitrd/trunk/geninitrd
==============================================================================
--- geninitrd/trunk/geninitrd	(original)
+++ geninitrd/trunk/geninitrd	Wed Mar 14 21:11:23 2012
@@ -434,15 +434,18 @@
 
 	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