From e8623cf25467cb880909d10d4e15abc877cbc89d Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Tue, 23 May 2006 20:00:19 +0000 Subject: [PATCH] Added a -type f to the find call in stage1 for bug #132180. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1141 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 6 +++++- targets/stage1/stage1-controller.sh | 6 +++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 90704f78..3dd3336c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.625 2006/05/19 22:02:56 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.626 2006/05/23 20:00:19 wolf31o2 Exp $ + + 23 May 2006; Chris Gianelloni + targets/stage1/stage1-controller.sh: + Added a -type f to the find call in stage1 for bug #132180. 19 May 2006; Chris Gianelloni livecd/cdtar/yaboot-1.3.13-cdtar.tar.bz2: diff --git a/targets/stage1/stage1-controller.sh b/targets/stage1/stage1-controller.sh index b7b7e9d8..0bf2de40 100755 --- a/targets/stage1/stage1-controller.sh +++ b/targets/stage1/stage1-controller.sh @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage1/stage1-controller.sh,v 1.12 2006/01/04 19:51:03 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage1/stage1-controller.sh,v 1.13 2006/05/23 20:00:19 wolf31o2 Exp $ . ${clst_sharedir}/targets/support/functions.sh @@ -60,8 +60,8 @@ case $1 in find -iname "*.py[co]" -exec rm -f {} \; # Cleanup all .a files except libgcc.a, *_nonshared.a and # /usr/lib/portage/bin/*.a - find -iname "*.a" | grep -v 'libgcc.a' | grep -v 'nonshared.a' | \ - grep -v '/usr/lib/portage/bin/' | grep -v 'libgcc_eh.a' | xargs \ + find -type f -iname "*.a" | grep -v 'libgcc.a' | grep -v 'nonshared.a' \ + | grep -v '/usr/lib/portage/bin/' | grep -v 'libgcc_eh.a' | xargs \ rm -f ;; *) -- 2.26.2