Move PKG_INSTALL_MASK functionality (see bug #81025) from dyn_install to dyn_package...

svn path=/main/trunk/; revision=2826

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 546182ee401b50edf287c25852e0c08fc26b13cf..f7931b63f51b95ca4bbcd262785a2e018b3b4f74 100755 (executable)
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -1001,6 +1001,7 @@ dyn_compile() {
 dyn_package() {
        trap "abort_package" SIGINT SIGQUIT
        cd "${PORTAGE_BUILDDIR}/image"
+       install_mask "${PORTAGE_BUILDDIR}/image" ${PKG_INSTALL_MASK}
        tar cpvf - ./ | bzip2 -f > ../bin.tar.bz2 || die "Failed to create tarball"
        cd ..
        xpak build-info inf.xpak
@@ -1069,9 +1070,6 @@ dyn_install() {
        prepall
        cd "${D}"
 
-       # Allow user to remove unwanted files.
-       install_mask "${D}" ${PKG_INSTALL_MASK}
-
        declare -i UNSAFE=0
        for i in $(find "${D}/" -type f -perm -2002); do
                ((UNSAFE++))