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 1RljeI-0008R8-5B for garchives@archives.gentoo.org; Fri, 13 Jan 2012 16:06:38 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3C0D8E0783; Fri, 13 Jan 2012 16:06:31 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 0B337E0783 for ; Fri, 13 Jan 2012 16:06:30 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 675C41B4032 for ; Fri, 13 Jan 2012 16:06:30 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id D849880044 for ; Fri, 13 Jan 2012 16:06:29 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <9ea603a611ddf4a8575ba73edc63b85213d7e701.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: bin/ X-VCS-Repository: proj/portage X-VCS-Files: bin/misc-functions.sh X-VCS-Directories: bin/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 9ea603a611ddf4a8575ba73edc63b85213d7e701 Date: Fri, 13 Jan 2012 16:06:29 +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: 450efbcc-3745-4a50-8119-4cd9fa2391d5 X-Archives-Hash: 58f8ce38e0e6c1f91ac885bb174d05fb commit: 9ea603a611ddf4a8575ba73edc63b85213d7e701 Author: Zac Medico gentoo org> AuthorDate: Fri Jan 13 16:06:20 2012 +0000 Commit: Zac Medico gentoo org> CommitDate: Fri Jan 13 16:06:20 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D9ea603a6 dyn_package: portable cp args by Mike Frysinger --- bin/misc-functions.sh | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh index 6094fb7..431e89f 100755 --- a/bin/misc-functions.sh +++ b/bin/misc-functions.sh @@ -1108,7 +1108,9 @@ dyn_package() { # make a temporary copy of ${D} so that any modifications we do that # are binpkg specific, do not influence the actual installed image. rm -rf "${PROOT}" || die "failed removing stale package tree" - cp -la "${PORTAGE_BUILDDIR}/image" "${PROOT}" || die "failed creating p= ackaging tree" + cp -pPR $(cp --help | grep -qs -e-l && echo -l) \ + "${PORTAGE_BUILDDIR}/image" "${PROOT}" \ + || die "failed creating packaging tree" =20 install_mask "${PROOT}" "${PKG_INSTALL_MASK}" =20