From 229dbbd2578e6f09cac1c006f549d8f23303c83b Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Thu, 17 Apr 2008 17:25:12 +0000 Subject: [PATCH] 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 --- ChangeLog | 4 ++++ targets/livecd-stage2/livecd-stage2-controller.sh | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0f83c1d3..2b496f15 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,10 @@ # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 # $Id: $ + 17 Apr 2008; Chris Gianelloni + 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 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 0b15c599..7e057f27 100755 --- 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/' | \ -- 2.26.2