From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id CDA2613877A for ; Tue, 2 Sep 2014 02:33:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8099BE0BC1; Tue, 2 Sep 2014 02:33:09 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9FF80E0BBD for ; Tue, 2 Sep 2014 02:33:08 +0000 (UTC) Received: from big_daddy.dol-sen.ca (S010600222de111ff.vc.shawcable.net [96.49.5.156]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: dolsen) by smtp.gentoo.org (Postfix) with ESMTPSA id 5067433F649; Tue, 2 Sep 2014 02:33:05 +0000 (UTC) From: Brian Dolbec To: catalyst@gentoo.org, gentoo-catalyst@lists.gentoo.org Subject: [gentoo-catalyst] [PATCH 3/7] stage1-controller.sh: Fix portage bin path hard coding Date: Mon, 1 Sep 2014 19:31:37 -0700 Message-Id: <1409625101-27112-4-git-send-email-dolsen@gentoo.org> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1409625101-27112-1-git-send-email-dolsen@gentoo.org> References: <1409625101-27112-1-git-send-email-dolsen@gentoo.org> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-catalyst@lists.gentoo.org Reply-to: gentoo-catalyst@lists.gentoo.org MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="------------1.9.3" X-Archives-Salt: 105f1f21-2bd5-41fe-9093-b701bad4e475 X-Archives-Hash: b6ce969ae8934ec3f135ac36423611f7 This is a multi-part message in MIME format. --------------1.9.3 Content-Type: text/plain; charset=UTF-8; format=fixed Content-Transfer-Encoding: 8bit Also rework to use find's filters instead of piping several times through grep. Code supplied by: Douglas Freed --- targets/stage1/stage1-controller.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --------------1.9.3 Content-Type: text/x-patch; name="0003-stage1-controller.sh-Fix-portage-bin-path-hard-codin.patch" Content-Transfer-Encoding: 8bit Content-Disposition: inline; filename="0003-stage1-controller.sh-Fix-portage-bin-path-hard-codin.patch" diff --git a/targets/stage1/stage1-controller.sh b/targets/stage1/stage1-controller.sh index 8dbd16b..1b2eee2 100755 --- a/targets/stage1/stage1-controller.sh +++ b/targets/stage1/stage1-controller.sh @@ -33,9 +33,9 @@ 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 . -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 + find . -path usr/lib/portage -prune -o -type f \ + -iname '*.a' ! -name 'libgcc.a' ! -name '*nonshared.a' \ + ! -name 'libgcc_eh.a' -print | xargs rm -f ;; *) --------------1.9.3--