1 |
commit: e3d0d7b81dfe3f8afcfb06de7db4a10a2588e13f |
2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jun 8 16:27:52 2014 +0000 |
4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jun 8 16:27:52 2014 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/releng.git;a=commit;h=e3d0d7b8 |
7 |
|
8 |
tools-musl/catalyst: add armv7a |
9 |
|
10 |
--- |
11 |
tools-musl/catalyst/portage.armv7a.hardened/bashrc | 15 +++ |
12 |
.../portage.armv7a.hardened/env/libintl.conf | 2 + |
13 |
.../portage.armv7a.hardened/env/parallel.conf | 1 + |
14 |
.../catalyst/portage.armv7a.hardened/package.env | 9 ++ |
15 |
.../portage.armv7a.hardened/package.keywords | 2 + |
16 |
.../catalyst/portage.armv7a.hardened/package.mask | 3 + |
17 |
.../portage.armv7a.hardened/package.unmask | 1 + |
18 |
.../catalyst/portage.armv7a.hardened/package.use | 1 + |
19 |
tools-musl/catalyst/portage.armv7a.vanilla/bashrc | 15 +++ |
20 |
.../portage.armv7a.vanilla/env/libintl.conf | 2 + |
21 |
.../portage.armv7a.vanilla/env/parallel.conf | 1 + |
22 |
.../catalyst/portage.armv7a.vanilla/package.env | 9 ++ |
23 |
.../portage.armv7a.vanilla/package.keywords | 2 + |
24 |
.../catalyst/portage.armv7a.vanilla/package.mask | 3 + |
25 |
.../catalyst/portage.armv7a.vanilla/package.unmask | 1 + |
26 |
.../catalyst/portage.armv7a.vanilla/package.use | 1 + |
27 |
.../portage.armv7a.vanilla/profile/use.mask | 1 + |
28 |
tools-musl/catalyst/run-armv7a.sh | 124 +++++++++++++++++++++ |
29 |
18 files changed, 193 insertions(+) |
30 |
|
31 |
diff --git a/tools-musl/catalyst/portage.armv7a.hardened/bashrc b/tools-musl/catalyst/portage.armv7a.hardened/bashrc |
32 |
new file mode 100644 |
33 |
index 0000000..70b67d2 |
34 |
--- /dev/null |
35 |
+++ b/tools-musl/catalyst/portage.armv7a.hardened/bashrc |
36 |
@@ -0,0 +1,15 @@ |
37 |
+post_src_install() { |
38 |
+ [[ $PN != musl ]] && return 0 |
39 |
+ |
40 |
+ local LDSO_ARCH=$(basename "${D}"/lib/ld-musl-*.so.1) |
41 |
+ mkdir "${D}"/usr/etc |
42 |
+ cat > "${D}"/usr/etc/${LDSO_ARCH%so.1}path <<EOF |
43 |
+/lib |
44 |
+/usr/lib |
45 |
+/usr/local/lib |
46 |
+/usr/lib/opengl/xorg-x11/lib |
47 |
+/usr/lib/gcc/${CHOST}/4.7.3 |
48 |
+/usr/${CHOST}/lib |
49 |
+/usr/games/lib |
50 |
+EOF |
51 |
+} |
52 |
|
53 |
diff --git a/tools-musl/catalyst/portage.armv7a.hardened/env/libintl.conf b/tools-musl/catalyst/portage.armv7a.hardened/env/libintl.conf |
54 |
new file mode 100644 |
55 |
index 0000000..06356b5 |
56 |
--- /dev/null |
57 |
+++ b/tools-musl/catalyst/portage.armv7a.hardened/env/libintl.conf |
58 |
@@ -0,0 +1,2 @@ |
59 |
+CFLAGS="-Wl,-lintl" |
60 |
+LDFLAGS="-lintl" |
61 |
|
62 |
diff --git a/tools-musl/catalyst/portage.armv7a.hardened/env/parallel.conf b/tools-musl/catalyst/portage.armv7a.hardened/env/parallel.conf |
63 |
new file mode 100644 |
64 |
index 0000000..c67232a |
65 |
--- /dev/null |
66 |
+++ b/tools-musl/catalyst/portage.armv7a.hardened/env/parallel.conf |
67 |
@@ -0,0 +1 @@ |
68 |
+MAKEOPTS=-j1 |
69 |
|
70 |
diff --git a/tools-musl/catalyst/portage.armv7a.hardened/package.env b/tools-musl/catalyst/portage.armv7a.hardened/package.env |
71 |
new file mode 100644 |
72 |
index 0000000..3574877 |
73 |
--- /dev/null |
74 |
+++ b/tools-musl/catalyst/portage.armv7a.hardened/package.env |
75 |
@@ -0,0 +1,9 @@ |
76 |
+dev-libs/glib libintl.conf |
77 |
+dev-libs/libelf libintl.conf |
78 |
+sys-apps/attr libintl.conf |
79 |
+sys-apps/kbd libintl.conf |
80 |
+sys-apps/man-db parallel.conf |
81 |
+sys-apps/net-tools libintl.conf |
82 |
+sys-fs/e2fsprogs libintl.conf |
83 |
+sys-fs/eudev libintl.conf |
84 |
+sys-process/procps libintl.conf |
85 |
|
86 |
diff --git a/tools-musl/catalyst/portage.armv7a.hardened/package.keywords b/tools-musl/catalyst/portage.armv7a.hardened/package.keywords |
87 |
new file mode 100644 |
88 |
index 0000000..25bfa75 |
89 |
--- /dev/null |
90 |
+++ b/tools-musl/catalyst/portage.armv7a.hardened/package.keywords |
91 |
@@ -0,0 +1,2 @@ |
92 |
+=sys-libs/musl-1.1.1 ~* |
93 |
+=sys-apps/getent-0 ~* |
94 |
|
95 |
diff --git a/tools-musl/catalyst/portage.armv7a.hardened/package.mask b/tools-musl/catalyst/portage.armv7a.hardened/package.mask |
96 |
new file mode 100644 |
97 |
index 0000000..794369e |
98 |
--- /dev/null |
99 |
+++ b/tools-musl/catalyst/portage.armv7a.hardened/package.mask |
100 |
@@ -0,0 +1,3 @@ |
101 |
+>sys-devel/gcc-4.7.3-r99 |
102 |
+sys-apps/systemd |
103 |
+sys-fs/udev |
104 |
|
105 |
diff --git a/tools-musl/catalyst/portage.armv7a.hardened/package.unmask b/tools-musl/catalyst/portage.armv7a.hardened/package.unmask |
106 |
new file mode 100644 |
107 |
index 0000000..6aabccd |
108 |
--- /dev/null |
109 |
+++ b/tools-musl/catalyst/portage.armv7a.hardened/package.unmask |
110 |
@@ -0,0 +1 @@ |
111 |
+=dev-libs/openssl-1.0.1g-r99::hardened-dev |
112 |
|
113 |
diff --git a/tools-musl/catalyst/portage.armv7a.hardened/package.use b/tools-musl/catalyst/portage.armv7a.hardened/package.use |
114 |
new file mode 100644 |
115 |
index 0000000..4ef695a |
116 |
--- /dev/null |
117 |
+++ b/tools-musl/catalyst/portage.armv7a.hardened/package.use |
118 |
@@ -0,0 +1 @@ |
119 |
+sys-libs/musl nls |
120 |
|
121 |
diff --git a/tools-musl/catalyst/portage.armv7a.vanilla/bashrc b/tools-musl/catalyst/portage.armv7a.vanilla/bashrc |
122 |
new file mode 100644 |
123 |
index 0000000..70b67d2 |
124 |
--- /dev/null |
125 |
+++ b/tools-musl/catalyst/portage.armv7a.vanilla/bashrc |
126 |
@@ -0,0 +1,15 @@ |
127 |
+post_src_install() { |
128 |
+ [[ $PN != musl ]] && return 0 |
129 |
+ |
130 |
+ local LDSO_ARCH=$(basename "${D}"/lib/ld-musl-*.so.1) |
131 |
+ mkdir "${D}"/usr/etc |
132 |
+ cat > "${D}"/usr/etc/${LDSO_ARCH%so.1}path <<EOF |
133 |
+/lib |
134 |
+/usr/lib |
135 |
+/usr/local/lib |
136 |
+/usr/lib/opengl/xorg-x11/lib |
137 |
+/usr/lib/gcc/${CHOST}/4.7.3 |
138 |
+/usr/${CHOST}/lib |
139 |
+/usr/games/lib |
140 |
+EOF |
141 |
+} |
142 |
|
143 |
diff --git a/tools-musl/catalyst/portage.armv7a.vanilla/env/libintl.conf b/tools-musl/catalyst/portage.armv7a.vanilla/env/libintl.conf |
144 |
new file mode 100644 |
145 |
index 0000000..06356b5 |
146 |
--- /dev/null |
147 |
+++ b/tools-musl/catalyst/portage.armv7a.vanilla/env/libintl.conf |
148 |
@@ -0,0 +1,2 @@ |
149 |
+CFLAGS="-Wl,-lintl" |
150 |
+LDFLAGS="-lintl" |
151 |
|
152 |
diff --git a/tools-musl/catalyst/portage.armv7a.vanilla/env/parallel.conf b/tools-musl/catalyst/portage.armv7a.vanilla/env/parallel.conf |
153 |
new file mode 100644 |
154 |
index 0000000..c67232a |
155 |
--- /dev/null |
156 |
+++ b/tools-musl/catalyst/portage.armv7a.vanilla/env/parallel.conf |
157 |
@@ -0,0 +1 @@ |
158 |
+MAKEOPTS=-j1 |
159 |
|
160 |
diff --git a/tools-musl/catalyst/portage.armv7a.vanilla/package.env b/tools-musl/catalyst/portage.armv7a.vanilla/package.env |
161 |
new file mode 100644 |
162 |
index 0000000..3574877 |
163 |
--- /dev/null |
164 |
+++ b/tools-musl/catalyst/portage.armv7a.vanilla/package.env |
165 |
@@ -0,0 +1,9 @@ |
166 |
+dev-libs/glib libintl.conf |
167 |
+dev-libs/libelf libintl.conf |
168 |
+sys-apps/attr libintl.conf |
169 |
+sys-apps/kbd libintl.conf |
170 |
+sys-apps/man-db parallel.conf |
171 |
+sys-apps/net-tools libintl.conf |
172 |
+sys-fs/e2fsprogs libintl.conf |
173 |
+sys-fs/eudev libintl.conf |
174 |
+sys-process/procps libintl.conf |
175 |
|
176 |
diff --git a/tools-musl/catalyst/portage.armv7a.vanilla/package.keywords b/tools-musl/catalyst/portage.armv7a.vanilla/package.keywords |
177 |
new file mode 100644 |
178 |
index 0000000..25bfa75 |
179 |
--- /dev/null |
180 |
+++ b/tools-musl/catalyst/portage.armv7a.vanilla/package.keywords |
181 |
@@ -0,0 +1,2 @@ |
182 |
+=sys-libs/musl-1.1.1 ~* |
183 |
+=sys-apps/getent-0 ~* |
184 |
|
185 |
diff --git a/tools-musl/catalyst/portage.armv7a.vanilla/package.mask b/tools-musl/catalyst/portage.armv7a.vanilla/package.mask |
186 |
new file mode 100644 |
187 |
index 0000000..794369e |
188 |
--- /dev/null |
189 |
+++ b/tools-musl/catalyst/portage.armv7a.vanilla/package.mask |
190 |
@@ -0,0 +1,3 @@ |
191 |
+>sys-devel/gcc-4.7.3-r99 |
192 |
+sys-apps/systemd |
193 |
+sys-fs/udev |
194 |
|
195 |
diff --git a/tools-musl/catalyst/portage.armv7a.vanilla/package.unmask b/tools-musl/catalyst/portage.armv7a.vanilla/package.unmask |
196 |
new file mode 100644 |
197 |
index 0000000..6aabccd |
198 |
--- /dev/null |
199 |
+++ b/tools-musl/catalyst/portage.armv7a.vanilla/package.unmask |
200 |
@@ -0,0 +1 @@ |
201 |
+=dev-libs/openssl-1.0.1g-r99::hardened-dev |
202 |
|
203 |
diff --git a/tools-musl/catalyst/portage.armv7a.vanilla/package.use b/tools-musl/catalyst/portage.armv7a.vanilla/package.use |
204 |
new file mode 100644 |
205 |
index 0000000..4ef695a |
206 |
--- /dev/null |
207 |
+++ b/tools-musl/catalyst/portage.armv7a.vanilla/package.use |
208 |
@@ -0,0 +1 @@ |
209 |
+sys-libs/musl nls |
210 |
|
211 |
diff --git a/tools-musl/catalyst/portage.armv7a.vanilla/profile/use.mask b/tools-musl/catalyst/portage.armv7a.vanilla/profile/use.mask |
212 |
new file mode 100644 |
213 |
index 0000000..cf56f2f |
214 |
--- /dev/null |
215 |
+++ b/tools-musl/catalyst/portage.armv7a.vanilla/profile/use.mask |
216 |
@@ -0,0 +1 @@ |
217 |
+hardened |
218 |
|
219 |
diff --git a/tools-musl/catalyst/run-armv7a.sh b/tools-musl/catalyst/run-armv7a.sh |
220 |
new file mode 100755 |
221 |
index 0000000..d5699e0 |
222 |
--- /dev/null |
223 |
+++ b/tools-musl/catalyst/run-armv7a.sh |
224 |
@@ -0,0 +1,124 @@ |
225 |
+#!/bin/bash |
226 |
+ |
227 |
+source /etc/catalyst/catalyst.conf |
228 |
+ |
229 |
+mydate=`date +%Y%m%d` |
230 |
+ |
231 |
+prepare_confs() { |
232 |
+ local arch=$1 |
233 |
+ local flavor=$2 |
234 |
+ |
235 |
+ for s in 1 2 3; do |
236 |
+ |
237 |
+ local cstage=stage${s} |
238 |
+ local p=$(( s - 1 )) |
239 |
+ [[ $p == 0 ]] && p=3 |
240 |
+ local pstage=stage${p} |
241 |
+ local tarch="${arch%_hardfp}" |
242 |
+ local parch="arm/${tarch}" |
243 |
+ local float |
244 |
+ |
245 |
+ [[ "${arch}" == "${tarch}" ]] \ |
246 |
+ && float="softfp" \ |
247 |
+ || float="hardfloat" |
248 |
+ |
249 |
+ cat stage-all.conf.template | \ |
250 |
+ sed -e "s:\(^version_stamp.*$\):\1-${mydate}:" \ |
251 |
+ -e "s:CSTAGE:${cstage}:g" \ |
252 |
+ -e "s:PSTAGE:${pstage}:g" \ |
253 |
+ -e "s:SARCH:${arch}:g" \ |
254 |
+ -e "s:PARCH:${parch}:g" \ |
255 |
+ -e "s:TARCH:${tarch}:g" \ |
256 |
+ -e "s:gentoo-linux-musl:${float}-linux-musleabi:" \ |
257 |
+ -e "s:FLAVOR:${flavor}:g" \ |
258 |
+ -e "s:MYCATALYST:$(pwd):g" \ |
259 |
+ > stage${s}-${arch}-musl-${flavor}.conf |
260 |
+ |
261 |
+ sed -i "/^portage_confdir/s:_hardfp::" \ |
262 |
+ stage${s}-${arch}-musl-${flavor}.conf |
263 |
+ |
264 |
+ done |
265 |
+ |
266 |
+ sed -i "/^chost/d" stage3-${arch}-musl-${flavor}.conf |
267 |
+} |
268 |
+ |
269 |
+banner() { |
270 |
+cat << EOF | tee -a zzz.log > stage$1-$2-musl-$3.log |
271 |
+ |
272 |
+************************************************************************ |
273 |
+* stage$1-$2-musl-$3 |
274 |
+************************************************************************" |
275 |
+ |
276 |
+EOF |
277 |
+} |
278 |
+ |
279 |
+ |
280 |
+do_stages() { |
281 |
+ local arch=$1 |
282 |
+ local flavor=$2 |
283 |
+ |
284 |
+ for s in 1 2 3; do |
285 |
+ local tgpath="${storedir}/builds/${flavor}/${arch}" |
286 |
+ local target="stage${s}-${arch}-musl-${flavor}-${mydate}.tar.bz2" |
287 |
+ local tglink="stage${s}-${arch}-musl-${flavor}.tar.bz2" |
288 |
+ |
289 |
+ if [[ ! -f "${tgpath}/${tglink}" ]]; then |
290 |
+ touch stage${s}-${arch}-musl-${flavor}.log |
291 |
+ echo "!!! ${target} at ${tgpath} doesn't exit" \ |
292 |
+ | tee -a zzz.log \ |
293 |
+ > stage${s}-${arch}-musl-${flavor}.err |
294 |
+ return 1 |
295 |
+ fi |
296 |
+ |
297 |
+ banner ${s} ${arch} ${flavor} |
298 |
+ catalyst -f stage${s}-${arch}-musl-${flavor}.conf \ |
299 |
+ | tee -a zzz.log \ |
300 |
+ > stage${s}-${arch}-musl-${flavor}.log \ |
301 |
+ 2> stage${s}-${arch}-musl-${flavor}.err |
302 |
+ |
303 |
+ if [[ -f "${tgpath}/${target}" ]]; then |
304 |
+ rm -f "${tgpath}/${tglink}" |
305 |
+ ln -s ${target} "${tgpath}/${tglink}" |
306 |
+ else |
307 |
+ echo "!!! ${target} was not generated" \ |
308 |
+ | tee -a zzz.log \ |
309 |
+ >stage${s}-${arch}-musl-${flavor}.err |
310 |
+ return 1 |
311 |
+ fi |
312 |
+ done |
313 |
+ |
314 |
+ return 0 |
315 |
+} |
316 |
+ |
317 |
+ |
318 |
+# |
319 |
+# approximate timings: |
320 |
+# |
321 |
+# catalyst -s current 3 minutes |
322 |
+# catalyst -f stage1 130 minutes |
323 |
+# |
324 |
+ |
325 |
+main() { |
326 |
+ >zzz.log |
327 |
+ |
328 |
+ catalyst -s current | tee -a zzz.log >snapshot.log 2>snapshot.err |
329 |
+ |
330 |
+ for arch in armv7a_hardfp; do |
331 |
+ for flavor in hardened vanilla; do |
332 |
+ prepare_confs ${arch} ${flavor} |
333 |
+ done |
334 |
+ done |
335 |
+ |
336 |
+ for arch in armv7a_hardfp; do |
337 |
+ for flavor in hardened vanilla; do |
338 |
+ do_stages ${arch} ${flavor} |
339 |
+ ret=$? |
340 |
+ if [[ $? == 1 ]]; then |
341 |
+ echo "FAILURE at ${arch} ${flavor} " | tee zzz.log |
342 |
+ return 1 |
343 |
+ fi |
344 |
+ done |
345 |
+ done |
346 |
+} |
347 |
+ |
348 |
+main $1 & |