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 ADC1313838B for ; Tue, 9 Sep 2014 18:27:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4F644E0844; Tue, 9 Sep 2014 18:27:49 +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 E7433E0844 for ; Tue, 9 Sep 2014 18:27:48 +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-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: dolsen) by smtp.gentoo.org (Postfix) with ESMTPSA id C156833F7DF for ; Tue, 9 Sep 2014 18:27:47 +0000 (UTC) Date: Tue, 9 Sep 2014 11:27:41 -0700 From: Brian Dolbec To: gentoo-catalyst@lists.gentoo.org Subject: Re: [gentoo-catalyst] [PATCH 6/7] setup_pkgmgr(): WIP Make the 'build' use flag optional Message-ID: <20140909112741.2757ea00.dolsen@gentoo.org> In-Reply-To: <1409625101-27112-7-git-send-email-dolsen@gentoo.org> References: <1409625101-27112-1-git-send-email-dolsen@gentoo.org> <1409625101-27112-7-git-send-email-dolsen@gentoo.org> Organization: Gentoo 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: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable X-Archives-Salt: ec36cbc0-5b5c-47b5-adc7-fdf84aab0adf X-Archives-Hash: c5a907fa2752de0b4cdc56bf5321766e On Mon, 1 Sep 2014 19:31:40 -0700 Brian Dolbec wrote: > --- > 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(-) >=20 Here is an updated patch based on discussions with Rick. =46rom 52024ff70bf044f026330efd5a167139649d529a Mon Sep 17 00:00:00 2001 From: Brian Dolbec Date: Mon, 1 Sep 2014 15:10:38 -0700 Subject: [PATCH] setup_pkgmgr(): Make the 'build' use flag passed in To: gentoo-catalyst@lists.gentoo.org The "build" USE flag is only needed for the stage1 build. It also causes other errors in later stages. This makes setup_pkgmgr() takes an optional USE flag string parameter to be added to the USE variable. --- targets/stage1/stage1-chroot.sh | 2 +- targets/support/chroot-functions.sh | 13 ++++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot= .sh index ed83f38..eccbd3f 100755 --- a/targets/stage1/stage1-chroot.sh +++ b/targets/stage1/stage1-chroot.sh @@ -21,7 +21,7 @@ then fi =20 ## Setup seed pkgmgr to ensure latest -clst_root_path=3D/ setup_pkgmgr +clst_root_path=3D/ setup_pkgmgr "build" =20 # Update stage3 if [ -n "${clst_update_seed}" ]; then diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-f= unctions.sh index 3495f14..0659ee0 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=3D"${USE} build"' >> /etc/port= age/make.conf - run_merge --oneshot --update sys-apps/portage - sed -i '/USE=3D"${USE} build"/d' /etc/portage/make.conf + if [ -n "$1" ];then + echo "Adding USE=3D'${USE} $1' to make.conf for portage build" + [ -e /etc/portage/make.conf ] && echo 'USE=3D"${USE} $1"' >> /etc/portag= e/make.conf + run_merge --oneshot --update sys-apps/portage + sed -i '/USE=3D"${USE} $1"/d' /etc/portage/make.conf + else + echo "Updating portage with USE=3D'${USE}'" + run_merge --oneshot --update sys-apps/portage + fi + } =20 cleanup_distcc() { --=20 2.1.0 --=20 Brian Dolbec