Gentoo Archives: gentoo-catalyst

From: "W. Trevor King" <wking@×××××××.us>
To: Catalyst <gentoo-catalyst@l.g.o>
Cc: "W. Trevor King" <wking@×××××××.us>
Subject: [gentoo-catalyst] [PATCH 1/2] spec: Add binpkg_blacklist option for troublesome packages
Date: Tue, 16 Apr 2013 19:42:53
Message-Id: d17d7220142adba328753ddc7caa0ab22a77d5c8.1366137972.git.wking@tremily.us
In Reply to: [gentoo-catalyst] [PATCH 0/2] Blacklisting binary packages by "W. Trevor King"
1 From: "W. Trevor King" <wking@×××××××.us>
2
3 For packages that don't use EAPI-5's sub-slots to track ABI
4 dependencies, binary packages may go stale without Portage noticing.
5 You can use this new option to list packages that may be troublesome.
6 Listed packages will be removed from the pkgcache, and rebuilt from
7 scratch for your seed.
8
9 If binpkg_blacklist is unset in your spec file, it defaults to
10 including the following packages:
11
12 * sys-devel/gcc: see, for example,
13 http://mid.gmane.org/20130412011158.GB17116@××××××××××××.us
14 * media-libs/mesa: see, for example, #454184
15 ---
16 modules/generic_stage_target.py | 4 +++-
17 targets/support/chroot-functions.sh | 5 +++++
18 2 files changed, 8 insertions(+), 1 deletion(-)
19
20 diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py
21 index 31cb025..4fbbb44 100644
22 --- a/modules/generic_stage_target.py
23 +++ b/modules/generic_stage_target.py
24 @@ -16,7 +16,9 @@ class generic_stage_target(generic_target):
25 self.valid_values.extend(["version_stamp","target","subarch",\
26 "rel_type","profile","snapshot","source_subpath","portage_confdir",\
27 "cflags","cxxflags","ldflags","cbuild","hostuse","portage_overlay",\
28 - "distcc_hosts","makeopts","pkgcache_path","kerncache_path"])
29 + "distcc_hosts","makeopts","pkgcache_path","kerncache_path",
30 + 'binpkg_blacklist',
31 + ])
32
33 self.set_valid_build_kernel_vars(addlargs)
34 generic_target.__init__(self,myspec,addlargs)
35 diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
36 index 35ffbaa..957af9d 100644
37 --- a/targets/support/chroot-functions.sh
38 +++ b/targets/support/chroot-functions.sh
39 @@ -261,6 +261,11 @@ run_merge() {
40 export EPAUSE_IGNORE=0
41 export CONFIG_PROTECT="-*"
42
43 + default_binpkg_blacklist="sys-devel/gcc media-libs/mesa"
44 + for binpkg in ${clst_binpkg_blacklist-${default_binpkg_blacklist}}; do
45 + rm -vf "/usr/portage/packages/${binpkg}"*
46 + done
47 +
48 if [ -n "${clst_VERBOSE}" ]
49 then
50 echo "ROOT=${ROOT} emerge ${clst_myemergeopts} -pt $@" || exit 1
51 --
52 1.8.2