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 BE0F31381F3 for ; Tue, 16 Apr 2013 19:42:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 70EB2E09F7; Tue, 16 Apr 2013 19:42:41 +0000 (UTC) Received: from vms173003pub.verizon.net (vms173003pub.verizon.net [206.46.173.3]) by pigeon.gentoo.org (Postfix) with ESMTP id 08800E09F7 for ; Tue, 16 Apr 2013 19:42:40 +0000 (UTC) Received: from odin.tremily.us ([unknown] [72.68.100.81]) by vms173003.mailsrvcs.net (Sun Java(tm) System Messaging Server 7u2-7.02 32bit (built Apr 16 2009)) with ESMTPA id <0MLD00J565F16Y80@vms173003.mailsrvcs.net> for gentoo-catalyst@lists.gentoo.org; Tue, 16 Apr 2013 14:42:38 -0500 (CDT) Received: by odin.tremily.us (Postfix, from userid 1000) id 91CFD96CF64; Tue, 16 Apr 2013 15:42:37 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tremily.us; s=odin; t=1366141357; bh=2xHjVnjY5Capiz5aUln+kF0PJItzPK1FCqjAnibms5I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:In-Reply-To: References; b=HtrJCJWdA0thEfTIticRLhACnCyUVwZ74ToO8azBrxxjD5ND1+qDS8ZdvNIkbdLoW tDbPnxn1XWwcnTDOdBTt9qae5wtkgz/dTdhS10R66zAjMgdG4ESgNzjDu0wXmPessf Bgev9diDSo0KAX2VhfatS189qYaT9kOLURT8dKYE= From: "W. Trevor King" To: Catalyst Cc: "W. Trevor King" Subject: [gentoo-catalyst] [PATCH 2/2] Revert "don't build packages during update_seed" Date: Tue, 16 Apr 2013 15:42:34 -0400 Message-id: <34b5be8734eb665c89a21377b2adf54fbab47473.1366137972.git.wking@tremily.us> X-Mailer: git-send-email 1.8.1.5 In-reply-to: References: <20130309121023.GE26574@odin.tremily.us> In-reply-to: References: 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 X-Archives-Salt: c3d9e5b8-a2b8-4f12-9f3c-5e548d2f5ff8 X-Archives-Hash: 1b431fb17b5927ee73d1e365a54af900 From: "W. Trevor King" This reverts commit e7ea409acb52b43e9ea141c57201f9f87673f7ba. This is a different approach to the same binpkg ABI compatibility problem that I address in 1ad133e (spec: Add binpkg_blacklist option for troublesome packages, 2013-04-15). We only need to have one approach, and I think binpkg_blacklist is cleaner. --- targets/stage1/stage1-chroot.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh index 3f628c2..462ea28 100644 --- a/targets/stage1/stage1-chroot.sh +++ b/targets/stage1/stage1-chroot.sh @@ -28,9 +28,9 @@ if [ -n "${clst_update_seed}" ]; then if [ "${clst_update_seed}" == "yes" ]; then echo "Updating seed stage..." if [ -n "${clst_update_seed_command}" ]; then - clst_root_path=/ run_merge "--buildpkg=n ${clst_update_seed_command}" + clst_root_path=/ run_merge "${clst_update_seed_command}" else - clst_root_path=/ run_merge "--buildpkg=n --update --deep --newuse --onlydeps gcc" + clst_root_path=/ run_merge "--update --deep --newuse --onlydeps gcc" fi elif [ "${clst_update_seed}" != "no" ]; then echo "Invalid setting for update_seed: ${clst_update_seed}" -- 1.8.2