From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 35433138D14 for ; Sun, 12 Jul 2015 14:41:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A7E60E08A4; Sun, 12 Jul 2015 14:41:55 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 47353E08A4 for ; Sun, 12 Jul 2015 14:41:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E2C6E340614 for ; Sun, 12 Jul 2015 14:41:53 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0EF0875A for ; Sun, 12 Jul 2015 14:41:47 +0000 (UTC) From: "Yuta SATOH" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Yuta SATOH" Message-ID: <1436712098.977ae16d2bd91209bf3193672aacdb69a26ef51f.yuta_satoh@gentoo> Subject: [gentoo-commits] proj/gentoo-bsd:master commit in: scripts/, scripts/mkstages/ X-VCS-Repository: proj/gentoo-bsd X-VCS-Files: scripts/automatic_updater.sh scripts/mkstages/create_forcestage3.sh X-VCS-Directories: scripts/ scripts/mkstages/ X-VCS-Committer: yuta_satoh X-VCS-Committer-Name: Yuta SATOH X-VCS-Revision: 977ae16d2bd91209bf3193672aacdb69a26ef51f X-VCS-Branch: master Date: Sun, 12 Jul 2015 14:41:47 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 16999aa6-34ef-48ef-a7c3-ed33d6f6b94d X-Archives-Hash: 43af956ab839eac18e88898b616683cb commit: 977ae16d2bd91209bf3193672aacdb69a26ef51f Author: Yuta SATOH gentoo gr jp> AuthorDate: Sun Jul 12 14:41:38 2015 +0000 Commit: Yuta SATOH gentoo gr 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"