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 3BB3B13877A for ; Tue, 2 Sep 2014 02:33:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BCD2EE0BBF; Tue, 2 Sep 2014 02:33:08 +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 4688CE0BBD for ; Tue, 2 Sep 2014 02:33:08 +0000 (UTC) Received: from big_daddy.dol-sen.ca (S010600222de111ff.vc.shawcable.net [96.49.5.156]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: dolsen) by smtp.gentoo.org (Postfix) with ESMTPSA id 074C933F8C7; Tue, 2 Sep 2014 02:33:06 +0000 (UTC) From: Brian Dolbec To: catalyst@gentoo.org, gentoo-catalyst@lists.gentoo.org Subject: [gentoo-catalyst] [PATCH 6/7] setup_pkgmgr(): WIP Make the 'build' use flag optional Date: Mon, 1 Sep 2014 19:31:40 -0700 Message-Id: <1409625101-27112-7-git-send-email-dolsen@gentoo.org> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1409625101-27112-1-git-send-email-dolsen@gentoo.org> References: <1409625101-27112-1-git-send-email-dolsen@gentoo.org> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-catalyst@lists.gentoo.org Reply-to: gentoo-catalyst@lists.gentoo.org MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="------------1.9.3" X-Archives-Salt: cde28754-065c-4b89-8b8f-83ae021866ce X-Archives-Hash: 25e5b68f99493cc2527c39c1e8e0a945 This is a multi-part message in MIME format. --------------1.9.3 Content-Type: text/plain; charset=UTF-8; format=fixed Content-Transfer-Encoding: 8bit --- targets/stage1/stage1-chroot.sh | 1 + targets/stage2/stage2-chroot.sh | 1 + targets/support/chroot-functions.sh | 13 ++++++++++--- 3 files changed, 12 insertions(+), 3 deletions(-) --------------1.9.3 Content-Type: text/x-patch; name="0006-setup_pkgmgr-WIP-Make-the-build-use-flag-optional.patch" Content-Transfer-Encoding: 8bit Content-Disposition: inline; filename="0006-setup_pkgmgr-WIP-Make-the-build-use-flag-optional.patch" diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh index ed83f38..7d8589f 100755 --- a/targets/stage1/stage1-chroot.sh +++ b/targets/stage1/stage1-chroot.sh @@ -21,6 +21,7 @@ then fi ## Setup seed pkgmgr to ensure latest +export PKGMGR_BUILD='yes' clst_root_path=/ setup_pkgmgr # Update stage3 diff --git a/targets/stage2/stage2-chroot.sh b/targets/stage2/stage2-chroot.sh index 61f5261..0f70a84 100755 --- a/targets/stage2/stage2-chroot.sh +++ b/targets/stage2/stage2-chroot.sh @@ -4,6 +4,7 @@ source /tmp/chroot-functions.sh # Setup the environment export FEATURES="${clst_myfeatures} nodoc noman noinfo -news" +export PKGMGR_BUILD='yes' if [ "${clst_VERBOSE}" ] then diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh index 3495f14..6260c69 100755 --- a/targets/support/chroot-functions.sh +++ b/targets/support/chroot-functions.sh @@ -170,9 +170,16 @@ setup_pkgmgr(){ # portage to avoid frying our /etc/portage/make.conf file. Otherwise, we could # just let emerge @system could merge it. # Use --update or portage will reinstall the same version. - [ -e /etc/portage/make.conf ] && echo 'USE="${USE} build"' >> /etc/portage/make.conf - run_merge --oneshot --update sys-apps/portage - sed -i '/USE="${USE} build"/d' /etc/portage/make.conf + if [ -n "${PKGMGR_BUILD}" ];then + echo "Adding USE='${USE} build' to make.conf for portage build" + [ -e /etc/portage/make.conf ] && echo 'USE="${USE} build"' >> /etc/portage/make.conf + run_merge --oneshot --update sys-apps/portage + sed -i '/USE="${USE} build"/d' /etc/portage/make.conf + else + echo "Updating portage with normal USE=" + run_merge --oneshot --update sys-apps/portage + fi + } cleanup_distcc() { --------------1.9.3--