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 F15001381F3 for ; Tue, 16 Apr 2013 19:42:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7799BE0A10; Tue, 16 Apr 2013 19:42:53 +0000 (UTC) Received: from vms173013pub.verizon.net (vms173013pub.verizon.net [206.46.173.13]) by pigeon.gentoo.org (Postfix) with ESMTP id 16614E0A10 for ; Tue, 16 Apr 2013 19:42:52 +0000 (UTC) Received: from odin.tremily.us ([unknown] [72.68.100.81]) by vms173013.mailsrvcs.net (Sun Java(tm) System Messaging Server 7u2-7.02 32bit (built Apr 16 2009)) with ESMTPA id <0MLD004WW5F16E70@vms173013.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 7752B96CF5F; 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=KprNdX2hH0u19GnbSBe1Bakl9MbmXpM/2EixC+HfCjU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:In-Reply-To: References; b=WIg/FY2XPVHi/bL3g3ECRoAUQ8yKER52A+fZC8usJ/aH72rQcZqdjOYHUQj7OiYBM uTFgW66eOJ5mR36FzWU91rFrj8QLli07B9eEpNG17STpLzP/T5mRfjT+9xZ+XZScHk OsLEXcEMY/KNwRBU8rcp0+hHGch+YEdeqae3iDqo= From: "W. Trevor King" To: Catalyst Cc: "W. Trevor King" Subject: [gentoo-catalyst] [PATCH 1/2] spec: Add binpkg_blacklist option for troublesome packages Date: Tue, 16 Apr 2013 15:42:33 -0400 Message-id: 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: e82b94a7-0b11-47f7-9c82-f041a56a3198 X-Archives-Hash: fa991b2469f07c11dda0eb31a9a5f01b From: "W. Trevor King" For packages that don't use EAPI-5's sub-slots to track ABI dependencies, binary packages may go stale without Portage noticing. You can use this new option to list packages that may be troublesome. Listed packages will be removed from the pkgcache, and rebuilt from scratch for your seed. If binpkg_blacklist is unset in your spec file, it defaults to including the following packages: * sys-devel/gcc: see, for example, http://mid.gmane.org/20130412011158.GB17116@odin.tremily.us * media-libs/mesa: see, for example, #454184 --- modules/generic_stage_target.py | 4 +++- targets/support/chroot-functions.sh | 5 +++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py index 31cb025..4fbbb44 100644 --- a/modules/generic_stage_target.py +++ b/modules/generic_stage_target.py @@ -16,7 +16,9 @@ class generic_stage_target(generic_target): self.valid_values.extend(["version_stamp","target","subarch",\ "rel_type","profile","snapshot","source_subpath","portage_confdir",\ "cflags","cxxflags","ldflags","cbuild","hostuse","portage_overlay",\ - "distcc_hosts","makeopts","pkgcache_path","kerncache_path"]) + "distcc_hosts","makeopts","pkgcache_path","kerncache_path", + 'binpkg_blacklist', + ]) self.set_valid_build_kernel_vars(addlargs) generic_target.__init__(self,myspec,addlargs) diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh index 35ffbaa..957af9d 100644 --- a/targets/support/chroot-functions.sh +++ b/targets/support/chroot-functions.sh @@ -261,6 +261,11 @@ run_merge() { export EPAUSE_IGNORE=0 export CONFIG_PROTECT="-*" + default_binpkg_blacklist="sys-devel/gcc media-libs/mesa" + for binpkg in ${clst_binpkg_blacklist-${default_binpkg_blacklist}}; do + rm -vf "/usr/portage/packages/${binpkg}"* + done + if [ -n "${clst_VERBOSE}" ] then echo "ROOT=${ROOT} emerge ${clst_myemergeopts} -pt $@" || exit 1 -- 1.8.2