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 755A61387FD for ; Thu, 11 Sep 2014 03:26:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D68A9E09DF; Thu, 11 Sep 2014 03:26:44 +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 2696CE09DF for ; Thu, 11 Sep 2014 03:26:43 +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 0E6A333BF44 for ; Thu, 11 Sep 2014 03:26:43 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6EB505310 for ; Thu, 11 Sep 2014 03:26:40 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1410404729.2426bb1f275c56150c07f8d1097296b00def7159.dol-sen@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: targets/stage1/, targets/support/ X-VCS-Repository: proj/catalyst X-VCS-Files: targets/stage1/stage1-chroot.sh targets/support/chroot-functions.sh X-VCS-Directories: targets/stage1/ targets/support/ X-VCS-Committer: dol-sen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 2426bb1f275c56150c07f8d1097296b00def7159 X-VCS-Branch: master Date: Thu, 11 Sep 2014 03:26:40 +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: efc97528-19ee-4642-b003-319ae34da6e3 X-Archives-Hash: 072e5fdade77e701f4179efe20c87412 commit: 2426bb1f275c56150c07f8d1097296b00def7159 Author: Brian Dolbec gentoo org> AuthorDate: Mon Sep 1 22:10:38 2014 +0000 Commit: Brian Dolbec gmail com> CommitDate: Thu Sep 11 03:05:29 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=2426bb1f setup_pkgmgr(): Make the 'build' use flag passed in 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 | 12 +++++++++--- 2 files changed, 10 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 ## Setup seed pkgmgr to ensure latest -clst_root_path=/ setup_pkgmgr +clst_root_path=/ setup_pkgmgr "build" # Update stage3 if [ -n "${clst_update_seed}" ]; then diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh index a31e8bf..ee820ed 100755 --- a/targets/support/chroot-functions.sh +++ b/targets/support/chroot-functions.sh @@ -170,9 +170,15 @@ 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 might just waste time/cycles and 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 "$1" ];then + echo "Adding USE='${USE} $1' to make.conf for portage build" + [ -e /etc/portage/make.conf ] && echo 'USE="${USE} $1"' >> /etc/portage/make.conf + run_merge --oneshot --update sys-apps/portage + sed -i '/USE="${USE} $1"/d' /etc/portage/make.conf + else + echo "Updating portage with USE='${USE}'" + run_merge --oneshot --update sys-apps/portage + fi } cleanup_distcc() { 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 2D25613838B for ; Thu, 11 Sep 2014 03:08:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4387BE09A1; Thu, 11 Sep 2014 03:08:43 +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 4F171E09A1 for ; Thu, 11 Sep 2014 03:08:42 +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 065FD3401DA for ; Thu, 11 Sep 2014 03:08:41 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AAFAB5302 for ; Thu, 11 Sep 2014 03:08:39 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1410404729.2426bb1f275c56150c07f8d1097296b00def7159.dol-sen@gentoo> Subject: [gentoo-commits] proj/catalyst:pending commit in: targets/stage1/, targets/support/ X-VCS-Repository: proj/catalyst X-VCS-Files: targets/stage1/stage1-chroot.sh targets/support/chroot-functions.sh X-VCS-Directories: targets/stage1/ targets/support/ X-VCS-Committer: dol-sen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 2426bb1f275c56150c07f8d1097296b00def7159 X-VCS-Branch: pending Date: Thu, 11 Sep 2014 03:08:39 +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: a577066c-f9ee-474a-8272-00322811fed2 X-Archives-Hash: 13bfe35e40b871db96d8569a040966b1 Message-ID: <20140911030839.hqgwPUgqy7bYl5Kjt9Z4IzDM3wtVKU6RXnR_F2UmDXA@z> commit: 2426bb1f275c56150c07f8d1097296b00def7159 Author: Brian Dolbec gentoo org> AuthorDate: Mon Sep 1 22:10:38 2014 +0000 Commit: Brian Dolbec gmail com> CommitDate: Thu Sep 11 03:05:29 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=2426bb1f setup_pkgmgr(): Make the 'build' use flag passed in 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 | 12 +++++++++--- 2 files changed, 10 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 ## Setup seed pkgmgr to ensure latest -clst_root_path=/ setup_pkgmgr +clst_root_path=/ setup_pkgmgr "build" # Update stage3 if [ -n "${clst_update_seed}" ]; then diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh index a31e8bf..ee820ed 100755 --- a/targets/support/chroot-functions.sh +++ b/targets/support/chroot-functions.sh @@ -170,9 +170,15 @@ 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 might just waste time/cycles and 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 "$1" ];then + echo "Adding USE='${USE} $1' to make.conf for portage build" + [ -e /etc/portage/make.conf ] && echo 'USE="${USE} $1"' >> /etc/portage/make.conf + run_merge --oneshot --update sys-apps/portage + sed -i '/USE="${USE} $1"/d' /etc/portage/make.conf + else + echo "Updating portage with USE='${USE}'" + run_merge --oneshot --update sys-apps/portage + fi } cleanup_distcc() {