From 3879a3b564d024dfe04b5e72f67fe6f2718791b6 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sat, 14 Jun 2014 21:27:16 -0500
Subject: Fix initramfs build failure when multiarch libraries are installed

---
 usr/share/initramfs-tools/hooks/cryptlukssc | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'usr/share')

diff --git a/usr/share/initramfs-tools/hooks/cryptlukssc b/usr/share/initramfs-tools/hooks/cryptlukssc
index 0795102..092d2e9 100755
--- a/usr/share/initramfs-tools/hooks/cryptlukssc
+++ b/usr/share/initramfs-tools/hooks/cryptlukssc
@@ -30,21 +30,21 @@ done
 # pcscd utilizes pthread_cancel
 mkdir -p ${DESTDIR}/lib
 copy_exec /usr/sbin/pcscd /sbin
-if [ -e /lib/*/libgcc_s.so.1 ]
+if [ -e /lib/*`uname -i`*/libgcc_s.so.1 ]
 then
-  copy_exec /lib/*/libgcc_s.so.1 /lib
+  copy_exec /lib/*`uname -i`*/libgcc_s.so.1 /lib
 else
   copy_exec /lib/libgcc_s.so.1 /lib
 fi
-if [ -e /lib/*/libpcsclite.so.1 ]
+if [ -e /lib/*`uname -i`*/libpcsclite.so.1 ]
 then
-  copy_exec /lib/*/libpcsclite.so.1 /lib
+  copy_exec /lib/*`uname -i`*/libpcsclite.so.1 /lib
 else
   copy_exec /lib/libpcsclite.so.1 /lib
 fi
-if [ -e /usr/lib/*/libusb-1.0.so.0 ]
+if [ -e /usr/lib/*`uname -i`*/libusb-1.0.so.0 ]
 then
-  copy_exec /usr/lib/*/libusb-1.0.so.0 /usr/lib
+  copy_exec /usr/lib/*`uname -i`*/libusb-1.0.so.0 /usr/lib
 else
   copy_exec /usr/lib/libusb-1.0.so.0 /usr/lib
 fi
@@ -83,9 +83,9 @@ copy_exec /usr/bin/smartauth.sh /bin
 # Libraries
 # cp /usr/lib/libltdl.so* ${DESTDIR}/usr/lib
 # cp /lib/libncurses.so.5 ${DESTDIR}/lib
-if [ -e /lib/*/libncursesw.so.5 ]
+if [ -e /lib/*`uname -i`*/libncursesw.so.5 ]
 then
-  cp /lib/*/libncursesw.so.5 ${DESTDIR}/lib
+  cp /lib/*`uname -i`*/libncursesw.so.5 ${DESTDIR}/lib
 else
   cp /lib/libncursesw.so.5 ${DESTDIR}/lib
 fi
-- 
cgit v1.2.1