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 1RljuF-00069K-V3 for garchives@archives.gentoo.org; Fri, 13 Jan 2012 16:23:08 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 951A7E052E; Fri, 13 Jan 2012 16:22:58 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 605B6E052E for ; Fri, 13 Jan 2012 16:22:58 +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 E61371B4033 for ; Fri, 13 Jan 2012 16:22:57 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 152B180044 for ; Fri, 13 Jan 2012 16:22:57 +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: 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: c978b14d9a400c30616f27b63d8aa2d6d0522c0f Date: Fri, 13 Jan 2012 16:22:57 +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: 9f8430b1-e17b-4b9b-82a7-f12740cebc2c X-Archives-Hash: 6cc23c881c8595911e4c51c90a70669c commit: c978b14d9a400c30616f27b63d8aa2d6d0522c0f Author: Zac Medico gentoo org> AuthorDate: Fri Jan 13 16:21:31 2012 +0000 Commit: Zac Medico gentoo org> CommitDate: Fri Jan 13 16:21:31 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Dc978b14d dyn_install: skip copy if possible Also, fix EPREFIX breakage since commit 5d5364e982820fda56db5a40884e1c5f8e784b96. --- bin/misc-functions.sh | 27 ++++++++++++++++----------- 1 files changed, 16 insertions(+), 11 deletions(-) diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh index 431e89f..2c002cc 100755 --- a/bin/misc-functions.sh +++ b/bin/misc-functions.sh @@ -1095,24 +1095,29 @@ preinst_selinux_labels() { } =20 dyn_package() { + local PROOT =20 [[ " ${FEATURES} " =3D=3D *" force-prefix "* ]] || \ - case "$EAPI" in 0|1|2) local ED=3D${D} ;; esac + case "$EAPI" in 0|1|2) local EPREFIX=3D ED=3D${D} ;; esac =20 # Make sure $PWD is not ${D} so that we don't leave gmon.out files # in there in case any tools were built with -pg in CFLAGS. =20 cd "${T}" =20 - local PROOT=3D"${T}/packaging" - # 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 -pPR $(cp --help | grep -qs -e-l && echo -l) \ - "${PORTAGE_BUILDDIR}/image" "${PROOT}" \ - || die "failed creating packaging tree" - - install_mask "${PROOT}" "${PKG_INSTALL_MASK}" + if [[ -n ${PKG_INSTALL_MASK} ]] ; then + PROOT=3D${T}/packaging/ + # 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 -pPR $(cp --help | grep -qs -e-l && echo -l) \ + "${D}" "${PROOT}" \ + || die "failed creating packaging tree" + + install_mask "${PROOT%/}${EPREFIX}/" "${PKG_INSTALL_MASK}" + else + PROOT=3D${D} + fi =20 local tar_options=3D"" [[ $PORTAGE_VERBOSE =3D 1 ]] && tar_options+=3D" -v" @@ -1145,7 +1150,7 @@ dyn_package() { vecho ">>> Done." =20 # cleanup our temp tree - rm -rf "${PROOT}" + [[ -n ${PKG_INSTALL_MASK} ]] && rm -rf "${PROOT}" cd "${PORTAGE_BUILDDIR}" >> "$PORTAGE_BUILDDIR/.packaged" || \ die "Failed to create $PORTAGE_BUILDDIR/.packaged"