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 48D8C138ADA for ; Thu, 26 Feb 2015 20:13:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 67912E0984; Thu, 26 Feb 2015 20:13:09 +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 0DC5EE0984 for ; Thu, 26 Feb 2015 20:13:09 +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 D1FDF340C23 for ; Thu, 26 Feb 2015 20:12:54 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D07DC129CC for ; Thu, 26 Feb 2015 20:12:42 +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: <1420091886.f11d2f64ff8af00bc4ac13e6d74f46c598334a91.dolsen@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: targets/support/ X-VCS-Repository: proj/catalyst X-VCS-Files: targets/support/chroot-functions.sh X-VCS-Directories: targets/support/ X-VCS-Committer: dolsen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: f11d2f64ff8af00bc4ac13e6d74f46c598334a91 X-VCS-Branch: master Date: Thu, 26 Feb 2015 20:12:42 +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: fc31c713-0bfe-44b3-bb3d-50228c9c8bb8 X-Archives-Hash: d1325baa4057dff4fe270d6a357af7bf commit: f11d2f64ff8af00bc4ac13e6d74f46c598334a91 Author: Brian Dolbec gentoo org> AuthorDate: Sun Feb 10 20:06:15 2013 +0000 Commit: Brian Dolbec gentoo org> CommitDate: Thu Jan 1 05:58:06 2015 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=f11d2f64 Fix a bug that portage didn't get rebuilt with changed use flags If clst_PGKCACHE is defined, --newuse was not being added to clst_myemergeopts, so then portage was not being rebuilt if portage was already up to date. Conflicts: targets/support/chroot-functions.sh --- targets/support/chroot-functions.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh index ee820ed..3b7f77b 100755 --- a/targets/support/chroot-functions.sh +++ b/targets/support/chroot-functions.sh @@ -170,14 +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. + # Use --newuse to make sure it rebuilds with any changed use flags. 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 + run_merge --oneshot --update --newuse 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 + run_merge --oneshot --update --newuse sys-apps/portage fi } 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 EE3841389E2 for ; Thu, 1 Jan 2015 05:59:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0AE94E0891; Thu, 1 Jan 2015 05:59:11 +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 6D4FFE088A for ; Thu, 1 Jan 2015 05:59:09 +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 8D4C83406D1 for ; Thu, 1 Jan 2015 05:59:08 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 55F2AE9F2 for ; Thu, 1 Jan 2015 05:59:04 +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: <1420091886.f11d2f64ff8af00bc4ac13e6d74f46c598334a91.dolsen@gentoo> Subject: [gentoo-commits] proj/catalyst:pending commit in: targets/support/ X-VCS-Repository: proj/catalyst X-VCS-Files: targets/support/chroot-functions.sh X-VCS-Directories: targets/support/ X-VCS-Committer: dolsen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: f11d2f64ff8af00bc4ac13e6d74f46c598334a91 X-VCS-Branch: pending Date: Thu, 1 Jan 2015 05:59:04 +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: ec88dd77-3259-46d8-8b5c-4545535ce47e X-Archives-Hash: 09117a0839332027ca428711acd7b327 Message-ID: <20150101055904.NI-vtHyji0w2OFh-p2lXxF6aYDVJWsp5c7p1msQ72kQ@z> commit: f11d2f64ff8af00bc4ac13e6d74f46c598334a91 Author: Brian Dolbec gentoo org> AuthorDate: Sun Feb 10 20:06:15 2013 +0000 Commit: Brian Dolbec gentoo org> CommitDate: Thu Jan 1 05:58:06 2015 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=f11d2f64 Fix a bug that portage didn't get rebuilt with changed use flags If clst_PGKCACHE is defined, --newuse was not being added to clst_myemergeopts, so then portage was not being rebuilt if portage was already up to date. Conflicts: targets/support/chroot-functions.sh --- targets/support/chroot-functions.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh index ee820ed..3b7f77b 100755 --- a/targets/support/chroot-functions.sh +++ b/targets/support/chroot-functions.sh @@ -170,14 +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. + # Use --newuse to make sure it rebuilds with any changed use flags. 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 + run_merge --oneshot --update --newuse 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 + run_merge --oneshot --update --newuse sys-apps/portage fi }