try to fix hammer

2 files changed, 13 insertions, 7 deletions

diff --git a/scripts/scrubtree b/scripts/scrubtree
index 5d38567d6..10ed1a81a 100755
--- a/scripts/scrubtree
+++ b/scripts/scrubtree
@@ -14,13 +14,19 @@ if [ $ARCH = ia64 ]; then
     STRIP="strip --strip-debug"
 fi
 
+if [ $ARCH = x86_64 ]; then
+    LIBDIR=lib64
+else
+    LIBDIR=lib
+fi
+
 # Must create ld.so.conf, because ldconfig does not cache
 # dirs specified on the command line.
 touch $p/etc/ld.so.conf
 mkdir $p/proc
 mount -t proc proc $p/proc
-[ -d $p/usr/X11R6/lib ] && echo /usr/X11R6/lib > $p/etc/ld.so.conf
-echo /usr/kerberos/lib > $p/etc/ld.so.conf
+[ -d $p/usr/X11R6/$LIBDIR ] && echo /usr/X11R6/$LIBDIR > $p/etc/ld.so.conf
+echo /usr/kerberos/$LIBDIR > $p/etc/ld.so.conf
 (cd $p; /usr/sbin/chroot $p usr/sbin/ldconfig )
 
 if [ $ARCH != s390 -a $ARCH != s390x ]; then
@@ -51,7 +57,7 @@ done
 
 umount $p/proc
 
-for l in `find $p -type f -perm +100 | grep -v "usr/X11R6/lib/modules" | xargs file | sed -n 's/^\([^:]*\):.*ELF.*$/\1/p'`; do
+for l in `find $p -type f -perm +100 | grep -v "usr/X11R6/$LIBDIR/modules" | xargs file | sed -n 's/^\([^:]*\):.*ELF.*$/\1/p'`; do
     $STRIP $l -R .comment -R .note `objdump -h $l | \
 	sed -n 's/^.*\(\.gnu\.warning\.[^ ]*\) .*$/-R \1/p'`
 done
diff --git a/scripts/upd-instroot b/scripts/upd-instroot
index 80c4f0ae5..55d4cd5a3 100755
--- a/scripts/upd-instroot
+++ b/scripts/upd-instroot
@@ -692,10 +692,10 @@ usr/bin/sftp
 usr/bin/ssh
 usr/bin/termidx
 usr/bin/xargs
-usr/kerberos/lib/libgssapi*
-usr/kerberos/lib/libkrb5*
-usr/kerberos/lib/libk5crypto*
-usr/kerberos/lib/libcom_err*
+usr/kerberos/$LIBDIR/libgssapi*
+usr/kerberos/$LIBDIR/libkrb5*
+usr/kerberos/$LIBDIR/libk5crypto*
+usr/kerberos/$LIBDIR/libcom_err*
 usr/sbin/mtr
 usr/sbin/traceroute
 EOF