1 |
commit: 0437c729b942358e7e3e877f2e240750fe2a0a72 |
2 |
Author: Benda Xu <heroxbd <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Aug 7 06:16:48 2017 +0000 |
4 |
Commit: Benda XU <heroxbd <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Aug 7 06:16:48 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/android.git/commit/?id=0437c729 |
7 |
|
8 |
profiles: remove the deprecated rap profiles. |
9 |
|
10 |
They are implemented as linux-standalone. |
11 |
|
12 |
profiles/bootstrap/glibc/make.defaults | 4 ---- |
13 |
profiles/bootstrap/glibc/make.defaults.in | 4 ---- |
14 |
profiles/bootstrap/glibc/parent | 1 - |
15 |
profiles/bootstrap/glibc/profile.bashrc | 9 --------- |
16 |
profiles/bootstrap/make.defaults | 9 --------- |
17 |
profiles/bootstrap/package.use | 9 --------- |
18 |
profiles/bootstrap/parent | 1 - |
19 |
profiles/bootstrap/use.mask | 15 --------------- |
20 |
.../default/linux/arm/13.0/armv5te/rap/make.defaults | 3 --- |
21 |
profiles/default/linux/arm/13.0/armv5te/rap/parent | 2 -- |
22 |
.../default/linux/arm/13.0/armv7a/rap/make.defaults | 3 --- |
23 |
profiles/default/linux/arm/13.0/armv7a/rap/parent | 2 -- |
24 |
profiles/features/rap/make.defaults | 2 -- |
25 |
profiles/features/rap/packages | 19 ------------------- |
26 |
profiles/features/rap/profile.bashrc | 9 --------- |
27 |
profiles/features/rap/use.force | 5 ----- |
28 |
profiles/features/rap/use.mask | 8 -------- |
29 |
profiles/profiles.desc | 1 - |
30 |
18 files changed, 106 deletions(-) |
31 |
|
32 |
diff --git a/profiles/bootstrap/glibc/make.defaults b/profiles/bootstrap/glibc/make.defaults |
33 |
deleted file mode 100644 |
34 |
index 6d9b6b7..0000000 |
35 |
--- a/profiles/bootstrap/glibc/make.defaults |
36 |
+++ /dev/null |
37 |
@@ -1,4 +0,0 @@ |
38 |
-# Set correct PYTHONPATH for Portage, since our Python lives in |
39 |
-# $EPREFIX/tmp, bug #407573 |
40 |
- |
41 |
-PYTHONPATH=/opt/gentoo/usr/lib/portage/pym |
42 |
|
43 |
diff --git a/profiles/bootstrap/glibc/make.defaults.in b/profiles/bootstrap/glibc/make.defaults.in |
44 |
deleted file mode 100644 |
45 |
index 4ee3272..0000000 |
46 |
--- a/profiles/bootstrap/glibc/make.defaults.in |
47 |
+++ /dev/null |
48 |
@@ -1,4 +0,0 @@ |
49 |
-# Set correct PYTHONPATH for Portage, since our Python lives in |
50 |
-# $EPREFIX/tmp, bug #407573 |
51 |
- |
52 |
-PYTHONPATH=@GENTOO_PORTAGE_EPREFIX@/usr/lib/portage/pym |
53 |
|
54 |
diff --git a/profiles/bootstrap/glibc/parent b/profiles/bootstrap/glibc/parent |
55 |
deleted file mode 100644 |
56 |
index f3229c5..0000000 |
57 |
--- a/profiles/bootstrap/glibc/parent |
58 |
+++ /dev/null |
59 |
@@ -1 +0,0 @@ |
60 |
-.. |
61 |
|
62 |
diff --git a/profiles/bootstrap/glibc/profile.bashrc b/profiles/bootstrap/glibc/profile.bashrc |
63 |
deleted file mode 100644 |
64 |
index 37d3907..0000000 |
65 |
--- a/profiles/bootstrap/glibc/profile.bashrc |
66 |
+++ /dev/null |
67 |
@@ -1,9 +0,0 @@ |
68 |
-# Hack for bash because curses is not always available (linux). |
69 |
-[[ ${PN} == "bash" ]] && EXTRA_ECONF="--without-curses" |
70 |
- |
71 |
-if [[ ${PN} == gcc ]]; then |
72 |
- CPPFLAGS="-I\"${EPREFIX}\"/usr/include" |
73 |
- local dlprefix=$(realpath ${EPREFIX}/lib/$(gcc -print-multi-os-directory)) |
74 |
- local libprefix=$(realpath ${EPREFIX}/usr/lib/$(gcc -print-multi-os-directory)) |
75 |
- LDFLAGS="-L\"${libprefix}\" -Wl,--dynamic-linker=\"$(echo ${dlprefix}/ld-linux*.so.*)\"" |
76 |
-fi |
77 |
|
78 |
diff --git a/profiles/bootstrap/make.defaults b/profiles/bootstrap/make.defaults |
79 |
deleted file mode 100644 |
80 |
index ecbd1e6..0000000 |
81 |
--- a/profiles/bootstrap/make.defaults |
82 |
+++ /dev/null |
83 |
@@ -1,9 +0,0 @@ |
84 |
-# and we don't need to spam the user about news until after a --sync |
85 |
-# because the tools aren't available to read the news item yet anyway. |
86 |
- |
87 |
-FEATURES="${FEATURES} -news" |
88 |
- |
89 |
-# Disable the STALE warning because the snapshot frequently gets stale. |
90 |
-# DON'T REMOVE this one, stage3's tree check relies on this one |
91 |
- |
92 |
-PORTAGE_SYNC_STALE=0 |
93 |
|
94 |
diff --git a/profiles/bootstrap/package.use b/profiles/bootstrap/package.use |
95 |
deleted file mode 100644 |
96 |
index 45aa99c..0000000 |
97 |
--- a/profiles/bootstrap/package.use |
98 |
+++ /dev/null |
99 |
@@ -1,9 +0,0 @@ |
100 |
-# Most binary Linux distributions seem to fancy toolchains that do not |
101 |
-# do c++ support (need to install a separate package). Since we don't |
102 |
-# check for g++, just make sure binutils won't try to build gold |
103 |
-# (needs c++), it will get there once we built our own GCC with c++ |
104 |
-# support. For that reason we cannot globally mask cxx, because then |
105 |
-# GCC will be built without c++ support too. |
106 |
- |
107 |
-sys-devel/binutils -cxx |
108 |
-dev-libs/gmp -cxx |
109 |
|
110 |
diff --git a/profiles/bootstrap/parent b/profiles/bootstrap/parent |
111 |
deleted file mode 100644 |
112 |
index 291864c..0000000 |
113 |
--- a/profiles/bootstrap/parent |
114 |
+++ /dev/null |
115 |
@@ -1 +0,0 @@ |
116 |
-../default/linux/amd64/13.0/rap |
117 |
|
118 |
diff --git a/profiles/bootstrap/use.mask b/profiles/bootstrap/use.mask |
119 |
deleted file mode 100644 |
120 |
index 7edafc8..0000000 |
121 |
--- a/profiles/bootstrap/use.mask |
122 |
+++ /dev/null |
123 |
@@ -1,15 +0,0 @@ |
124 |
-# The default profiles (and IUSE defaults) introduce circular deps. By |
125 |
-# shoving this USE line here, we can ensure that the |
126 |
-# end-user always avoids circular deps while bootstrapping. |
127 |
- |
128 |
-berkdb |
129 |
-fortran |
130 |
-gdbm |
131 |
-git |
132 |
-nls |
133 |
-pcre |
134 |
-ssl |
135 |
-python |
136 |
-readline |
137 |
-acl |
138 |
- |
139 |
|
140 |
diff --git a/profiles/default/linux/arm/13.0/armv5te/rap/make.defaults b/profiles/default/linux/arm/13.0/armv5te/rap/make.defaults |
141 |
deleted file mode 100644 |
142 |
index 61ca581..0000000 |
143 |
--- a/profiles/default/linux/arm/13.0/armv5te/rap/make.defaults |
144 |
+++ /dev/null |
145 |
@@ -1,3 +0,0 @@ |
146 |
-# accept unstable keyword before RAP matures |
147 |
-# accept Prefix keyword to use Prefix overlay for transition |
148 |
-ACCEPT_KEYWORDS="~arm ~arm-linux" |
149 |
|
150 |
diff --git a/profiles/default/linux/arm/13.0/armv5te/rap/parent b/profiles/default/linux/arm/13.0/armv5te/rap/parent |
151 |
deleted file mode 100644 |
152 |
index a67a6e3..0000000 |
153 |
--- a/profiles/default/linux/arm/13.0/armv5te/rap/parent |
154 |
+++ /dev/null |
155 |
@@ -1,2 +0,0 @@ |
156 |
-gentoo_prefix:default/linux/arm/13.0/armv5te |
157 |
-../../../../../../features/rap |
158 |
|
159 |
diff --git a/profiles/default/linux/arm/13.0/armv7a/rap/make.defaults b/profiles/default/linux/arm/13.0/armv7a/rap/make.defaults |
160 |
deleted file mode 100644 |
161 |
index 61ca581..0000000 |
162 |
--- a/profiles/default/linux/arm/13.0/armv7a/rap/make.defaults |
163 |
+++ /dev/null |
164 |
@@ -1,3 +0,0 @@ |
165 |
-# accept unstable keyword before RAP matures |
166 |
-# accept Prefix keyword to use Prefix overlay for transition |
167 |
-ACCEPT_KEYWORDS="~arm ~arm-linux" |
168 |
|
169 |
diff --git a/profiles/default/linux/arm/13.0/armv7a/rap/parent b/profiles/default/linux/arm/13.0/armv7a/rap/parent |
170 |
deleted file mode 100644 |
171 |
index b105425..0000000 |
172 |
--- a/profiles/default/linux/arm/13.0/armv7a/rap/parent |
173 |
+++ /dev/null |
174 |
@@ -1,2 +0,0 @@ |
175 |
-gentoo_prefix:default/linux/arm/13.0/armv7a |
176 |
-../../../../../../features/rap |
177 |
|
178 |
diff --git a/profiles/features/rap/make.defaults b/profiles/features/rap/make.defaults |
179 |
deleted file mode 100644 |
180 |
index ed808e9..0000000 |
181 |
--- a/profiles/features/rap/make.defaults |
182 |
+++ /dev/null |
183 |
@@ -1,2 +0,0 @@ |
184 |
-# sandbox not prefixified yet. |
185 |
-FEATURES="-sandbox" |
186 |
|
187 |
diff --git a/profiles/features/rap/packages b/profiles/features/rap/packages |
188 |
deleted file mode 100644 |
189 |
index fd7c294..0000000 |
190 |
--- a/profiles/features/rap/packages |
191 |
+++ /dev/null |
192 |
@@ -1,19 +0,0 @@ |
193 |
-# kmod has not been prefixified |
194 |
--*virtual/modutils |
195 |
- |
196 |
-# shadow has not been prefixified |
197 |
--*virtual/shadow |
198 |
- |
199 |
-# don't need in rap |
200 |
--*virtual/dev-manager |
201 |
- |
202 |
-# permission is not handled by portage for normal users |
203 |
--*net-misc/iputils |
204 |
--*sys-apps/iproute2 |
205 |
- |
206 |
-# not a must |
207 |
--*sys-fs/e2fsprogs |
208 |
--*sys-apps/busybox |
209 |
- |
210 |
-# draws in baselayout-prefix |
211 |
--*virtual/service-manager |
212 |
|
213 |
diff --git a/profiles/features/rap/profile.bashrc b/profiles/features/rap/profile.bashrc |
214 |
deleted file mode 100644 |
215 |
index 5f7a4a4..0000000 |
216 |
--- a/profiles/features/rap/profile.bashrc |
217 |
+++ /dev/null |
218 |
@@ -1,9 +0,0 @@ |
219 |
-# use sysroot of toolchain to get include and library at compile time work |
220 |
-# Benda Xu <heroxbd@g.o> (17 Jun, 2013) |
221 |
- |
222 |
-if [[ ${CATEGORY} == sys-devel ]] && [[ ${PN} == binutils || ${PN} == libtool ]] \ |
223 |
- && [[ ${EBUILD_PHASE} == unpack ]]; then |
224 |
- elog "append --with-sysroot=${EPREFIX} to configure for Prefix libc" |
225 |
- EXTRA_ECONF+="--with-sysroot=${EPREFIX}" |
226 |
-fi |
227 |
- |
228 |
|
229 |
diff --git a/profiles/features/rap/use.force b/profiles/features/rap/use.force |
230 |
deleted file mode 100644 |
231 |
index 193e6d8..0000000 |
232 |
--- a/profiles/features/rap/use.force |
233 |
+++ /dev/null |
234 |
@@ -1,5 +0,0 @@ |
235 |
-# force Prefix |
236 |
-prefix |
237 |
- |
238 |
-# force rap (Prefix with libc) |
239 |
-rap |
240 |
|
241 |
diff --git a/profiles/features/rap/use.mask b/profiles/features/rap/use.mask |
242 |
deleted file mode 100644 |
243 |
index 4c45f2d..0000000 |
244 |
--- a/profiles/features/rap/use.mask |
245 |
+++ /dev/null |
246 |
@@ -1,8 +0,0 @@ |
247 |
-# unmask prefix |
248 |
--prefix |
249 |
- |
250 |
-# sys-libs/gpm has not been prefixified |
251 |
-gpm |
252 |
- |
253 |
-# sys-libs/pam has not been prefixified |
254 |
-pam |
255 |
|
256 |
diff --git a/profiles/profiles.desc b/profiles/profiles.desc |
257 |
deleted file mode 100644 |
258 |
index a7d42e7..0000000 |
259 |
--- a/profiles/profiles.desc |
260 |
+++ /dev/null |
261 |
@@ -1 +0,0 @@ |
262 |
-x86 default/linux/x86/13.0/rap stable |