1 |
commit: 821463492d2793609dfd628dc319d1772ee27bd6 |
2 |
Author: Benda Xu <heroxbd <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu May 26 07:39:57 2016 +0000 |
4 |
Commit: Benda XU <heroxbd <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu May 26 07:41:22 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82146349 |
7 |
|
8 |
p/f/p/package.mask: sys-apps/baselayout-prefix should only be used in prefix-rpath. |
9 |
|
10 |
profiles/features/prefix/package.mask | 4 ---- |
11 |
profiles/features/prefix/packages | 4 ---- |
12 |
profiles/features/prefix/rpath/packages | 5 +++++ |
13 |
3 files changed, 5 insertions(+), 8 deletions(-) |
14 |
|
15 |
diff --git a/profiles/features/prefix/package.mask b/profiles/features/prefix/package.mask |
16 |
index cb0e984..9207383 100644 |
17 |
--- a/profiles/features/prefix/package.mask |
18 |
+++ b/profiles/features/prefix/package.mask |
19 |
@@ -13,10 +13,6 @@ |
20 |
# fails to link wrt libiconv |
21 |
=sys-apps/coreutils-8.20 |
22 |
|
23 |
-# Benda Xu <heroxbd@g.o> (07 Aug 2012) |
24 |
-# mask revision for testing out openrc. bug #415895. |
25 |
-=sys-apps/baselayout-prefix-1.12.14-r1 |
26 |
- |
27 |
# Fabian Groffen <grobian@g.o> (01 Aug 2012) |
28 |
# Causes spurious errors due to considering some small files being |
29 |
# binary, bug #425668, comment #21. |
30 |
|
31 |
diff --git a/profiles/features/prefix/packages b/profiles/features/prefix/packages |
32 |
index 2116bab..5fadbfe 100644 |
33 |
--- a/profiles/features/prefix/packages |
34 |
+++ b/profiles/features/prefix/packages |
35 |
@@ -14,7 +14,6 @@ |
36 |
# This file removes everything from the base profile which is not |
37 |
# necessary/desired in a prefix environment. |
38 |
|
39 |
--*>=sys-apps/baselayout-2 |
40 |
-*net-misc/iputils |
41 |
-*sys-apps/iproute2 |
42 |
-*sys-apps/kbd |
43 |
@@ -23,9 +22,6 @@ |
44 |
-*virtual/modutils |
45 |
-*virtual/shadow |
46 |
|
47 |
-# add back prefix baselayout |
48 |
-*sys-apps/baselayout-prefix |
49 |
- |
50 |
# we don't want this either (as baselayout-prefix provides the functions.sh |
51 |
# file that this was added to ../base/packages for) |
52 |
-*sys-apps/openrc |
53 |
|
54 |
diff --git a/profiles/features/prefix/rpath/packages b/profiles/features/prefix/rpath/packages |
55 |
index 3f6c868..7474427a 100644 |
56 |
--- a/profiles/features/prefix/rpath/packages |
57 |
+++ b/profiles/features/prefix/rpath/packages |
58 |
@@ -5,3 +5,8 @@ |
59 |
# we don't ever will install these, so no need to depend on them |
60 |
-*virtual/libc |
61 |
-*virtual/os-headers |
62 |
+ |
63 |
+-*>=sys-apps/baselayout-2 |
64 |
+# add back prefix baselayout |
65 |
+*sys-apps/baselayout-prefix |
66 |
+ |