From: Theodore Ts'o <tytso@mit.edu>
Date: Sun, 16 Nov 2008 15:35:41 +0000 (-0500)
Subject: debian: Fix mkinitfs on x86_64 systems
X-Git-Tag: v1.41.4~38
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=124e6767fc3509b0a1ea7c3f53545b6082db8043;p=thirdparty%2Fe2fsprogs.git

debian: Fix mkinitfs on x86_64 systems

On x86_64 systems, we need to filter out linux-vdso.so lines from the
output of the ldd program when determining the library dependencies.

Addresses-Debian-Bug: #503057

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
---

diff --git a/debian/initrd-tools.e2fsprogs b/debian/initrd-tools.e2fsprogs
index 726015930..ed49db41d 100644
--- a/debian/initrd-tools.e2fsprogs
+++ b/debian/initrd-tools.e2fsprogs
@@ -20,7 +20,7 @@ esac
 
 PROGS="/sbin/tune2fs /usr/lib/e2initrd_helper"
 LIBS=`unset LD_LIBRARY_PATH LD_PRELOAD; ldd $PROGS | \
-    grep -v 'linux-gate.so' | sort -u | awk '{print $3}'` 
+    grep -vE 'linux-gate.so|linux-vdso.so' | sort -u | awk '{print $3}'`
 for i in $LIBS
 do
   	if test -f /etc/ld.so.preload && grep -s ^$i\$ /etc/ld.so.preload; then