From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1SKKtX-0007q5-5g for garchives@archives.gentoo.org; Wed, 18 Apr 2012 02:45:23 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D57B8E0D51; Wed, 18 Apr 2012 02:45:14 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id A20D2E0D51 for ; Wed, 18 Apr 2012 02:45:14 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 15F961B4016 for ; Wed, 18 Apr 2012 02:45:14 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id CDBAEE5403 for ; Wed, 18 Apr 2012 02:45:12 +0000 (UTC) From: "Robin H. Johnson" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" Message-ID: <1334717105.b2caeadca2a792e6b743332a953792cb357485b9.robbat2@gentoo> Subject: [gentoo-commits] proj/genkernel:master commit in: / X-VCS-Repository: proj/genkernel X-VCS-Files: ChangeLog gen_initramfs.sh X-VCS-Directories: / X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: b2caeadca2a792e6b743332a953792cb357485b9 X-VCS-Branch: master Date: Wed, 18 Apr 2012 02:45:12 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 5cc078f7-b656-4f8e-ac6b-a969a132abb3 X-Archives-Hash: 1c2f13ca3d276e314d2cbb135a7bc994 commit: b2caeadca2a792e6b743332a953792cb357485b9 Author: Robin H. Johnson gentoo org> AuthorDate: Wed Apr 18 02:45:05 2012 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Wed Apr 18 02:45:05 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/genkernel.git= ;a=3Dcommit;h=3Db2caeadc lddtree call must be outside the for loop. --- ChangeLog | 3 +++ gen_initramfs.sh | 16 ++++++++-------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6ed045a..761a724 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,9 @@ # Distributed under the GPL v2 # $Id$ =20 + 18 Apr 2012; Robin H. Johnson gen_initramfs.sh: + lddtree call must be outside the for loop. + 16 Apr 2012; Robin H. Johnson gen_initramfs.sh: Use CC0 instead of public domain for copy_binaries to cover French jurisdiction concerns. diff --git a/gen_initramfs.sh b/gen_initramfs.sh index 7db1c95..3739fe6 100755 --- a/gen_initramfs.sh +++ b/gen_initramfs.sh @@ -31,15 +31,15 @@ copy_binaries() { if LC_ALL=3DC lddtree "${binary}" 2>&1 | fgrep -q 'not found'; then gen_die "Binary ${binary} is linked to missing libraries and may need= to be re-built" fi - - lddtree "${binary}" \ - | tr ')(' '\n' \ - | awk '/=3D>/{ if($3 ~ /^\//){print $3}}' \ - | sort \ - | uniq \ - | cpio -p --make-directories --dereference --quiet "${destdir}" \ - || gen_die "Binary ${f} or some of its library dependencies could no= t be copied" done + # This must be OUTSIDE the for loop, we only want to run lddtree etc ON= CE. + lddtree "$@" \ + | tr ')(' '\n' \ + | awk '/=3D>/{ if($3 ~ /^\//){print $3}}' \ + | sort \ + | uniq \ + | cpio -p --make-directories --dereference --quiet "${destdir}" \ + || gen_die "Binary ${f} or some of its library dependencies could not= be copied" } =20 append_base_layout() {