1 |
commit: b006a6fc53f2e545778f5ed516914bf07cacce5a |
2 |
Author: Mo Zhou <cdluminate <AT> gmail <DOT> com> |
3 |
AuthorDate: Sat Aug 10 14:20:53 2019 +0000 |
4 |
Commit: Benda XU <heroxbd <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Sep 28 02:41:17 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b006a6fc |
7 |
|
8 |
Prefix profile exp to dev migration. |
9 |
|
10 |
1. eudev, elogind and pam are available. |
11 |
2. Move rpath masks into features/prefix/rpath. |
12 |
3. Mask systemd and its reverse dependencies. |
13 |
|
14 |
Closes: https://github.com/gentoo/gentoo/pull/12555 |
15 |
Closes: https://github.com/gentoo/gentoo/pull/12678 |
16 |
Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org> |
17 |
|
18 |
profiles/features/prefix/package.mask | 42 ++++++++++++---------- |
19 |
profiles/features/prefix/package.use.mask | 12 ++++++- |
20 |
profiles/features/prefix/{ => rpath}/package.mask | 10 +++--- |
21 |
profiles/features/prefix/rpath/use.mask | 21 ++++++++--- |
22 |
.../features/prefix/standalone/package.use.mask | 2 +- |
23 |
profiles/features/prefix/use.mask | 11 ++---- |
24 |
profiles/profiles.desc | 2 +- |
25 |
7 files changed, 60 insertions(+), 40 deletions(-) |
26 |
|
27 |
diff --git a/profiles/features/prefix/package.mask b/profiles/features/prefix/package.mask |
28 |
index 6c331738314..c2367c0c1f8 100644 |
29 |
--- a/profiles/features/prefix/package.mask |
30 |
+++ b/profiles/features/prefix/package.mask |
31 |
@@ -1,22 +1,26 @@ |
32 |
-# Copyright 1999-2017 Gentoo Foundation |
33 |
+# Copyright 1999-2019 Gentoo Authors |
34 |
# Distributed under the terms of the GNU General Public License v2 |
35 |
|
36 |
-# Jeremy Olexa <darkside@g.o> (2009-06-30) |
37 |
-# The PAM auth system just will not work in Gentoo Prefix, instead the host auth |
38 |
-# system should be used. |
39 |
-sys-libs/pam |
40 |
-sys-auth/pambase |
41 |
+# Benda Xu <heroxbd@g.o> (2019-08-20) |
42 |
+# systemd is set to invade pid 1, which is not possible for Prefix. |
43 |
+# The following are its reverse dependencies. |
44 |
+sys-apps/systemd |
45 |
+dev-libs/libreport |
46 |
+app-admin/abrt |
47 |
+app-admin/gnome-abrt |
48 |
+app-admin/systemdgenie |
49 |
+dev-python/python-systemd |
50 |
+games-util/gamemode |
51 |
+gnome-extra/gnome-logs |
52 |
+gnome-extra/gnome-user-share |
53 |
+gnome-extra/office-runner |
54 |
+kde-misc/systemd-kcm |
55 |
+<sys-apps/bolt-0.5 |
56 |
+sys-apps/gentoo-systemd-integration |
57 |
+sys-apps/systemd-readahead |
58 |
+sys-process/systemd-cron |
59 |
+www-misc/profile-sync-daemon |
60 |
+<x11-wm/mutter-3.30 |
61 |
+<gnome-base/gnome-shell-3.30 |
62 |
+<virtual/service-manager-1 |
63 |
|
64 |
-# Jeremy Olexa <darkside@g.o> (2009-06-02) |
65 |
-# If you have MacFuse or some other implementation of fuse installed, you can |
66 |
-# probably use this by placing sys-fs/fuse in package.provided, bug 272210 |
67 |
-net-fs/curlftpfs |
68 |
- |
69 |
-# Jeremy Olexa <darkside@g.o> (2008-12-02) |
70 |
-# Reported to work. However, you will need to package.provide some deps. |
71 |
-# See bug 248809 for more details. |
72 |
-net-fs/openafs |
73 |
- |
74 |
-# Fabian Groffen <grobian@g.o> (2008-01-11) |
75 |
-# Screws up things, see bug #204998 |
76 |
-<sys-devel/gcc-3.4.0 |
77 |
|
78 |
diff --git a/profiles/features/prefix/package.use.mask b/profiles/features/prefix/package.use.mask |
79 |
index bb3817c570a..b54fd4ab047 100644 |
80 |
--- a/profiles/features/prefix/package.use.mask |
81 |
+++ b/profiles/features/prefix/package.use.mask |
82 |
@@ -1,6 +1,16 @@ |
83 |
-# Copyright 1999-2017 Gentoo Foundation |
84 |
+# Copyright 1999-2019 Gentoo Authors |
85 |
# Distributed under the terms of the GNU General Public License v2 |
86 |
|
87 |
+# Benda Xu <heroxbd@g.o> (2019-08-20) |
88 |
+# avoid gnome-extra/gnome-user-share, which depends on systemd. |
89 |
+gnome-base/gnome-extra-apps share |
90 |
+ |
91 |
+# Benda Xu <heroxbd@g.o> (2019-08-20) |
92 |
+# avoid sys-apps/systemd |
93 |
+net-analyzer/wireshark sdjournal |
94 |
+sys-apps/dbus-broker launcher |
95 |
+www-servers/uwsgi uwsgi_plugins_systemd_logger |
96 |
+ |
97 |
# Benda Xu <heroxbd@g.o> (2016-07-28) |
98 |
# Needs root privilege. |
99 |
sys-fs/eudev hwdb kmod |
100 |
|
101 |
diff --git a/profiles/features/prefix/package.mask b/profiles/features/prefix/rpath/package.mask |
102 |
similarity index 100% |
103 |
copy from profiles/features/prefix/package.mask |
104 |
copy to profiles/features/prefix/rpath/package.mask |
105 |
index 6c331738314..e3f46170a20 100644 |
106 |
--- a/profiles/features/prefix/package.mask |
107 |
+++ b/profiles/features/prefix/rpath/package.mask |
108 |
@@ -7,16 +7,16 @@ |
109 |
sys-libs/pam |
110 |
sys-auth/pambase |
111 |
|
112 |
-# Jeremy Olexa <darkside@g.o> (2009-06-02) |
113 |
-# If you have MacFuse or some other implementation of fuse installed, you can |
114 |
-# probably use this by placing sys-fs/fuse in package.provided, bug 272210 |
115 |
-net-fs/curlftpfs |
116 |
- |
117 |
# Jeremy Olexa <darkside@g.o> (2008-12-02) |
118 |
# Reported to work. However, you will need to package.provide some deps. |
119 |
# See bug 248809 for more details. |
120 |
net-fs/openafs |
121 |
|
122 |
+# Jeremy Olexa <darkside@g.o> (2009-06-02) |
123 |
+# If you have MacFuse or some other implementation of fuse installed, you can |
124 |
+# probably use this by placing sys-fs/fuse in package.provided, bug 272210 |
125 |
+net-fs/curlftpfs |
126 |
+ |
127 |
# Fabian Groffen <grobian@g.o> (2008-01-11) |
128 |
# Screws up things, see bug #204998 |
129 |
<sys-devel/gcc-3.4.0 |
130 |
|
131 |
diff --git a/profiles/features/prefix/rpath/use.mask b/profiles/features/prefix/rpath/use.mask |
132 |
index 0ad2254fd54..297038e128f 100644 |
133 |
--- a/profiles/features/prefix/rpath/use.mask |
134 |
+++ b/profiles/features/prefix/rpath/use.mask |
135 |
@@ -1,12 +1,23 @@ |
136 |
-# Copyright 1999-2014 Gentoo Foundation |
137 |
+# Copyright 1999-2019 Gentoo Authors |
138 |
# Distributed under the terms of the GNU General Public License v2 |
139 |
|
140 |
+# Benda Xu <heroxbd@g.o> (2019-08-20) |
141 |
+# Migrated from features/prefix: |
142 |
+# USE flags inherited by the base/use.defaults file that shouldn't be |
143 |
+# in Prefix rpath. |
144 |
+cups |
145 |
+# USE=pam just does not make sense in Gentoo Prefix. Should be using the host |
146 |
+# auth system. |
147 |
+pam |
148 |
+# USE=udev just does not make sense in Gentoo Prefix. bug 293480 |
149 |
+udev |
150 |
+ |
151 |
+# Benda Xu <heroxbd@g.o> (2019-06-26) |
152 |
+# Not supported |
153 |
+eselect-ldso |
154 |
+ |
155 |
# prefix-guest USE flag should be set in prefix rpath profiles |
156 |
-prefix-guest |
157 |
|
158 |
# multilib is never going to work as expected in Prefix rpath |
159 |
multilib |
160 |
- |
161 |
-# Benda Xu <heroxbd@g.o> (2019-06-26) |
162 |
-# Not supported |
163 |
-eselect-ldso |
164 |
|
165 |
diff --git a/profiles/features/prefix/standalone/package.use.mask b/profiles/features/prefix/standalone/package.use.mask |
166 |
index 9b7d7871511..7653e7fd7c1 100644 |
167 |
--- a/profiles/features/prefix/standalone/package.use.mask |
168 |
+++ b/profiles/features/prefix/standalone/package.use.mask |
169 |
@@ -1,4 +1,4 @@ |
170 |
-# Copyright 1999-2019 Gentoo Foundation |
171 |
+# Copyright 1999-2019 Gentoo Authors |
172 |
# Distributed under the terms of the GNU General Public License v2 |
173 |
|
174 |
# Benda Xu <heroxbd@g.o> (2019-01-26) |
175 |
|
176 |
diff --git a/profiles/features/prefix/use.mask b/profiles/features/prefix/use.mask |
177 |
index 4340ef9aa4c..be9e1433e84 100644 |
178 |
--- a/profiles/features/prefix/use.mask |
179 |
+++ b/profiles/features/prefix/use.mask |
180 |
@@ -1,4 +1,4 @@ |
181 |
-# Copyright 1999-2017 Gentoo Foundation |
182 |
+# Copyright 1999-2019 Gentoo Authors |
183 |
# Distributed under the terms of the GNU General Public License v2 |
184 |
|
185 |
# prefix USE flag should always be unmasked in prefix profiles |
186 |
@@ -8,12 +8,7 @@ |
187 |
-userland_GNU |
188 |
|
189 |
# USE flags inherited by the base/use.defaults file that shouldn't be in Prefix |
190 |
-cups |
191 |
gpm |
192 |
|
193 |
-# USE=pam just does not make sense in Gentoo Prefix. Should be using the host |
194 |
-# auth system. |
195 |
-pam |
196 |
- |
197 |
-# USE=udev just does not make sense in Gentoo Prefix. bug 293480 |
198 |
-udev |
199 |
+# need to invade pid 1, which is not possible for Prefix. |
200 |
+systemd |
201 |
|
202 |
diff --git a/profiles/profiles.desc b/profiles/profiles.desc |
203 |
index b45c90b1902..79d81595933 100644 |
204 |
--- a/profiles/profiles.desc |
205 |
+++ b/profiles/profiles.desc |
206 |
@@ -258,7 +258,7 @@ ppc64-linux prefix/linux/ppc64 exp |
207 |
x86-linux prefix/linux/x86 exp |
208 |
|
209 |
# Linux Standalone Profiles |
210 |
-amd64-linux default/linux/amd64/17.0/no-multilib/prefix/kernel-3.2+ exp |
211 |
+amd64-linux default/linux/amd64/17.0/no-multilib/prefix/kernel-3.2+ dev |
212 |
amd64-linux default/linux/amd64/17.0/no-multilib/prefix/kernel-2.6.32+ exp |
213 |
amd64-linux default/linux/amd64/17.0/no-multilib/prefix/kernel-2.6.16+ exp |
214 |
x86-linux default/linux/x86/17.0/prefix/kernel-3.2+ exp |