We should be matching all possible LIBDIRs, so make sure we do that.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1398 d1e1f19c-881f-0410-ab34-b69fee027534

diff --git a/ChangeLog b/ChangeLog
index 0f83c1d31c05efc07be1977e30005fb9ab70be72..2b496f15613ab42d77fcb3f45e1bc43d3053238f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Id: $
 
+  17 Apr 2008; Chris Gianelloni <wolf31o2@gentoo.org>
+  targets/livecd-stage2/livecd-stage2-controller.sh:
+  We should be matching all possible LIBDIRs, so make sure we do that.
+
   17 Apr 2008; Chris Gianelloni <wolf31o2@gentoo.org>
   targets/support/livecdfs-update.sh:
   We no longer need the metadata.tar.bz2, since the Installer uses

diff --git a/targets/livecd-stage2/livecd-stage2-controller.sh b/targets/livecd-stage2/livecd-stage2-controller.sh
index 0b15c59909601604fcb8a66bedcfaaca3d41bda1..7e057f27e181973b8420c74664867ca786a2fc8d 100755 (executable)
--- a/targets/livecd-stage2/livecd-stage2-controller.sh
+++ b/targets/livecd-stage2/livecd-stage2-controller.sh
@@ -101,11 +101,11 @@ case $1 in
                        # Clean out man, info and doc files
                        rm -rf ${clst_chroot_path}/usr/share/{man,doc,info}/*
                        # Zap all .pyc and .pyo files
-                       find ${clst_chroot_path}/usr/lib -iname "*.py[co]" -exec rm -f {} \;
+                       find ${clst_chroot_path}/usr/lib* -iname "*.py[co]" -exec rm -f {} \;
                fi
                # Cleanup all .a files except libgcc.a, *_nonshared.a and
                # /usr/lib/portage/bin/*.a
-               find ${clst_chroot_path}usr/lib -type f -iname "*.a" | \
+               find ${clst_chroot_path}usr/lib* -type f -iname "*.a" | \
                        grep -v 'libgcc.a' | \
                        grep -v 'nonshared.a' | \
                        grep -v '/usr/lib/portage/bin/' | \