[gentoo-commits] proj/gentoo-bsd:master commit in: scripts/, scripts/mkstages/

[gentoo-commits] proj/gentoo-bsd:master commit in: scripts/, scripts/mkstages/

[Yuta SATOH]

commit:     977ae16d2bd91209bf3193672aacdb69a26ef51f
Author:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Sun Jul 12 14:41:38 2015 +0000
Commit:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
CommitDate: Sun Jul 12 14:41:38 2015 +0000
URL:        https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=977ae16d

automatic_updater.sh, create_forcestage3.sh: added REMOVEPERL flag.

 scripts/automatic_updater.sh           | 7 ++++++-
 scripts/mkstages/create_forcestage3.sh | 6 +++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/scripts/automatic_updater.sh b/scripts/automatic_updater.sh
index ff13ceb..c9766ab 100644
--- a/scripts/automatic_updater.sh
+++ b/scripts/automatic_updater.sh
@@ -1,5 +1,6 @@
 #/bin/bash
 set -eu
+REMOVEPERL=${REMOVEPERL:-0}
 
 if [[ $# -ne 2 ]] ; then
 	echo "need 2 argument"
@@ -101,10 +102,13 @@ post_freebsd_userland(){
 	emerge sys-apps/portage
 }
 
-emerge_world(){
+remove_perl(){
 	emerge -C dev-lang/perl
 	emerge -C perl-core/* virtual/perl*
 	emerge dev-lang/perl
+}
+
+emerge_world(){
 	emerge sys-devel/libtool
 	emerge -u dev-libs/libxml2
 	emerge -u dev-libs/libxslt app-arch/libarchive dev-libs/glib
@@ -132,6 +136,7 @@ case "$TARGETMODE" in
 		post_freebsd_userland
 	;;
 	"world" )
+		[[ ${REMOVEPERL} -ne 0 ]] && removeperl
 		emerge_world
 		cleanup
 	;;

diff --git a/scripts/mkstages/create_forcestage3.sh b/scripts/mkstages/create_forcestage3.sh
index 4edead8..515aae2 100644
--- a/scripts/mkstages/create_forcestage3.sh
+++ b/scripts/mkstages/create_forcestage3.sh
@@ -53,16 +53,16 @@ chroot_update(){
 	echo "MAKEOPTS=\"-j$(sysctl hw.ncpu | awk '{ print $2 + 1 }')"\" >> "${makeconf}"
 	echo 'USE="${USE} -fortran -build-kernel"' >> "${makeconf}"
 
-	export EMERGE_DEFAULT_OPTS="-q" 
+	export EMERGE_DEFAULT_OPTS="-q"
 	chroot "${WORKDIR}" bash /automatic_updater.sh ${TARGETVER} kernel
 	chroot "${WORKDIR}" bash /automatic_updater.sh ${TARGETVER} freebsd_userland
-	chroot "${WORKDIR}" bash /automatic_updater.sh ${TARGETVER} world
+	REMOVEPERL=1 chroot "${WORKDIR}" bash /automatic_updater.sh ${TARGETVER} world
 	unset EMERGE_DEFAULT_OPTS
 }
 
 check_ecompressdir() {
 	# dirty solution
-	# /dev is still mounted; performing auto-bind-umount... 
+	# /dev is still mounted; performing auto-bind-umount...
 	local PID=$(ps auxw | grep ebuild-helpers/ecompressdir | grep -v grep | awk '{ print $2 }' | xargs)
 	if [[ -n "${PID}" ]] ; then
 		echo "kill ecompressdir"