1 |
commit: afcff59a6d9dce0c6dde4e3488b4c21fd1295802 |
2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Jun 27 16:27:54 2014 +0000 |
4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jun 27 16:28:53 2014 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/releng.git;a=commit;h=afcff59a |
7 |
|
8 |
tools-musl + tools-uclibc: begin refactoring to avoid repeated code |
9 |
|
10 |
--- |
11 |
tools-musl/run-armv7a.sh | 9 +-------- |
12 |
tools-musl/run-mipsel3.sh | 13 +++---------- |
13 |
tools-musl/run.sh | 9 +-------- |
14 |
tools-musl/stage-all.conf.template | 6 +++--- |
15 |
tools-uclibc/run-armv7a.sh | 9 +-------- |
16 |
tools-uclibc/run-mips32r2.sh | 9 +-------- |
17 |
tools-uclibc/run-mipsel3.sh | 9 +-------- |
18 |
tools-uclibc/run.sh | 11 ++--------- |
19 |
tools-uclibc/stage-all.conf.template | 4 ++-- |
20 |
9 files changed, 15 insertions(+), 64 deletions(-) |
21 |
|
22 |
diff --git a/tools-musl/run-armv7a.sh b/tools-musl/run-armv7a.sh |
23 |
index d5699e0..f170931 100755 |
24 |
--- a/tools-musl/run-armv7a.sh |
25 |
+++ b/tools-musl/run-armv7a.sh |
26 |
@@ -58,7 +58,7 @@ do_stages() { |
27 |
local flavor=$2 |
28 |
|
29 |
for s in 1 2 3; do |
30 |
- local tgpath="${storedir}/builds/${flavor}/${arch}" |
31 |
+ local tgpath="${storedir}/builds/musl/${flavor}/${arch}" |
32 |
local target="stage${s}-${arch}-musl-${flavor}-${mydate}.tar.bz2" |
33 |
local tglink="stage${s}-${arch}-musl-${flavor}.tar.bz2" |
34 |
|
35 |
@@ -91,13 +91,6 @@ do_stages() { |
36 |
} |
37 |
|
38 |
|
39 |
-# |
40 |
-# approximate timings: |
41 |
-# |
42 |
-# catalyst -s current 3 minutes |
43 |
-# catalyst -f stage1 130 minutes |
44 |
-# |
45 |
- |
46 |
main() { |
47 |
>zzz.log |
48 |
|
49 |
|
50 |
diff --git a/tools-musl/run-mipsel3.sh b/tools-musl/run-mipsel3.sh |
51 |
index 5a8b315..3da4f1c 100755 |
52 |
--- a/tools-musl/run-mipsel3.sh |
53 |
+++ b/tools-musl/run-mipsel3.sh |
54 |
@@ -26,8 +26,8 @@ prepare_confs() { |
55 |
-e "s:TARCH:${tarch}:g" \ |
56 |
-e "s:FLAVOR:${flavor}:g" \ |
57 |
-e "s:MYCATALYST:$(pwd):g" \ |
58 |
- -e "s|^cflags:.*|cflags: -O2 -march=mips3 -mplt -Wa,-mfix-loongson2f-nop -pipe|" \ |
59 |
- -e "s|^cxxflags:.*|cxxflags: -O2 -march=mips3 -mplt -Wa,-mfix-loongson2f-nop -pipe|" \ |
60 |
+ -e "s|^cflags:.*|cflags: -O2 -march=mips3 -mplt -Wa,-mfix-loongson2f-nop -pipe|" \ |
61 |
+ -e "s|^cxxflags:.*|cxxflags: -O2 -march=mips3 -mplt -Wa,-mfix-loongson2f-nop -pipe|" \ |
62 |
> stage${s}-${arch}-musl-${flavor}.conf |
63 |
done |
64 |
|
65 |
@@ -50,7 +50,7 @@ do_stages() { |
66 |
local flavor=$2 |
67 |
|
68 |
for s in 1 2 3; do |
69 |
- local tgpath="${storedir}/builds/${flavor}/${arch}" |
70 |
+ local tgpath="${storedir}/builds/musl/${flavor}/${arch}" |
71 |
local target="stage${s}-${arch}-musl-${flavor}-${mydate}.tar.bz2" |
72 |
local tglink="stage${s}-${arch}-musl-${flavor}.tar.bz2" |
73 |
|
74 |
@@ -83,13 +83,6 @@ do_stages() { |
75 |
} |
76 |
|
77 |
|
78 |
-# |
79 |
-# approximate timings: |
80 |
-# |
81 |
-# catalyst -s current 3 minutes |
82 |
-# catalyst -f stage1 130 minutes |
83 |
-# |
84 |
- |
85 |
main() { |
86 |
>zzz.log |
87 |
|
88 |
|
89 |
diff --git a/tools-musl/run.sh b/tools-musl/run.sh |
90 |
index 188092b..03ac819 100755 |
91 |
--- a/tools-musl/run.sh |
92 |
+++ b/tools-musl/run.sh |
93 |
@@ -59,7 +59,7 @@ do_stages() { |
94 |
local flavor=$2 |
95 |
|
96 |
for s in 1 2 3; do |
97 |
- local tgpath="${storedir}/builds/${flavor}/${arch}" |
98 |
+ local tgpath="${storedir}/builds/musl/${flavor}/${arch}" |
99 |
local target="stage${s}-${arch}-musl-${flavor}-${mydate}.tar.bz2" |
100 |
local tglink="stage${s}-${arch}-musl-${flavor}.tar.bz2" |
101 |
|
102 |
@@ -92,13 +92,6 @@ do_stages() { |
103 |
} |
104 |
|
105 |
|
106 |
-# |
107 |
-# approximate timings: |
108 |
-# |
109 |
-# catalyst -s current 3 minutes |
110 |
-# catalyst -f stage1 130 minutes |
111 |
-# |
112 |
- |
113 |
main() { |
114 |
>zzz.log |
115 |
|
116 |
|
117 |
diff --git a/tools-musl/stage-all.conf.template b/tools-musl/stage-all.conf.template |
118 |
index 6bc302b..d7dab4b 100644 |
119 |
--- a/tools-musl/stage-all.conf.template |
120 |
+++ b/tools-musl/stage-all.conf.template |
121 |
@@ -1,12 +1,12 @@ |
122 |
subarch: SARCH |
123 |
target: CSTAGE |
124 |
version_stamp: musl-FLAVOR |
125 |
-rel_type: FLAVOR/SARCH |
126 |
+rel_type: musl/FLAVOR/SARCH |
127 |
profile: hardened/linux/musl/PARCH |
128 |
snapshot: current |
129 |
-source_subpath: FLAVOR/SARCH/PSTAGE-SARCH-musl-FLAVOR |
130 |
+source_subpath: musl/FLAVOR/SARCH/PSTAGE-SARCH-musl-FLAVOR |
131 |
chost: TARCH-gentoo-linux-musl |
132 |
cflags: -O2 -pipe -fomit-frame-pointer |
133 |
cxxflags: -O2 -pipe -fomit-frame-pointer |
134 |
portage_confdir: MYCATALYST/portage.SARCH.FLAVOR |
135 |
-portage_overlay: /var/lib/layman/hardened-development |
136 |
+portage_overlay: /var/lib/layman/hardened-development-musl |
137 |
|
138 |
diff --git a/tools-uclibc/run-armv7a.sh b/tools-uclibc/run-armv7a.sh |
139 |
index c51ea4b..7a248f5 100755 |
140 |
--- a/tools-uclibc/run-armv7a.sh |
141 |
+++ b/tools-uclibc/run-armv7a.sh |
142 |
@@ -58,7 +58,7 @@ do_stages() { |
143 |
local flavor=$2 |
144 |
|
145 |
for s in 1 2 3; do |
146 |
- local tgpath="${storedir}/builds/${flavor}/${arch}" |
147 |
+ local tgpath="${storedir}/builds/uclibc/${flavor}/${arch}" |
148 |
local target="stage${s}-${arch}-uclibc-${flavor}-${mydate}.tar.bz2" |
149 |
local tglink="stage${s}-${arch}-uclibc-${flavor}.tar.bz2" |
150 |
|
151 |
@@ -91,13 +91,6 @@ do_stages() { |
152 |
} |
153 |
|
154 |
|
155 |
-# |
156 |
-# approximate timings: |
157 |
-# |
158 |
-# catalyst -s current 3 minutes |
159 |
-# catalyst -f stage1 130 minutes |
160 |
-# |
161 |
- |
162 |
main() { |
163 |
>zzz.log |
164 |
|
165 |
|
166 |
diff --git a/tools-uclibc/run-mips32r2.sh b/tools-uclibc/run-mips32r2.sh |
167 |
index 446772b..8829b3d 100755 |
168 |
--- a/tools-uclibc/run-mips32r2.sh |
169 |
+++ b/tools-uclibc/run-mips32r2.sh |
170 |
@@ -48,7 +48,7 @@ do_stages() { |
171 |
local flavor=$2 |
172 |
|
173 |
for s in 1 2 3; do |
174 |
- local tgpath="${storedir}/builds/${flavor}/${arch}" |
175 |
+ local tgpath="${storedir}/builds/uclibc/${flavor}/${arch}" |
176 |
local target="stage${s}-${arch}-uclibc-${flavor}-${mydate}.tar.bz2" |
177 |
local tglink="stage${s}-${arch}-uclibc-${flavor}.tar.bz2" |
178 |
|
179 |
@@ -81,13 +81,6 @@ do_stages() { |
180 |
} |
181 |
|
182 |
|
183 |
-# |
184 |
-# approximate timings: |
185 |
-# |
186 |
-# catalyst -s current 3 minutes |
187 |
-# catalyst -f stage1 130 minutes |
188 |
-# |
189 |
- |
190 |
main() { |
191 |
>zzz.log |
192 |
|
193 |
|
194 |
diff --git a/tools-uclibc/run-mipsel3.sh b/tools-uclibc/run-mipsel3.sh |
195 |
index 87fc1b7..510639c 100755 |
196 |
--- a/tools-uclibc/run-mipsel3.sh |
197 |
+++ b/tools-uclibc/run-mipsel3.sh |
198 |
@@ -48,7 +48,7 @@ do_stages() { |
199 |
local flavor=$2 |
200 |
|
201 |
for s in 1 2 3; do |
202 |
- local tgpath="${storedir}/builds/${flavor}/${arch}" |
203 |
+ local tgpath="${storedir}/builds/uclibc/${flavor}/${arch}" |
204 |
local target="stage${s}-${arch}-uclibc-${flavor}-${mydate}.tar.bz2" |
205 |
local tglink="stage${s}-${arch}-uclibc-${flavor}.tar.bz2" |
206 |
|
207 |
@@ -81,13 +81,6 @@ do_stages() { |
208 |
} |
209 |
|
210 |
|
211 |
-# |
212 |
-# approximate timings: |
213 |
-# |
214 |
-# catalyst -s current 3 minutes |
215 |
-# catalyst -f stage1 130 minutes |
216 |
-# |
217 |
- |
218 |
main() { |
219 |
>zzz.log |
220 |
|
221 |
|
222 |
diff --git a/tools-uclibc/run.sh b/tools-uclibc/run.sh |
223 |
index 45e0266..b1b8211 100755 |
224 |
--- a/tools-uclibc/run.sh |
225 |
+++ b/tools-uclibc/run.sh |
226 |
@@ -59,7 +59,7 @@ do_stages() { |
227 |
local flavor=$2 |
228 |
|
229 |
for s in 1 2 3; do |
230 |
- local tgpath="${storedir}/builds/${flavor}/${arch}" |
231 |
+ local tgpath="${storedir}/builds/uclibc/${flavor}/${arch}" |
232 |
local target="stage${s}-${arch}-uclibc-${flavor}-${mydate}.tar.bz2" |
233 |
local tglink="stage${s}-${arch}-uclibc-${flavor}.tar.bz2" |
234 |
|
235 |
@@ -92,13 +92,6 @@ do_stages() { |
236 |
} |
237 |
|
238 |
|
239 |
-# |
240 |
-# approximate timings: |
241 |
-# |
242 |
-# catalyst -s current 3 minutes |
243 |
-# catalyst -f stage1 130 minutes |
244 |
-# |
245 |
- |
246 |
main() { |
247 |
>zzz.log |
248 |
|
249 |
@@ -117,7 +110,7 @@ main() { |
250 |
do_stages ${arch} ${flavor} |
251 |
ret=$? |
252 |
if [[ $? == 1 ]]; then |
253 |
- echo "FAILURE at ${arch} ${flavor}" | tee zzz.log |
254 |
+ echo "FAILURE at ${arch} ${flavor} " | tee zzz.log |
255 |
return 1 |
256 |
fi |
257 |
done |
258 |
|
259 |
diff --git a/tools-uclibc/stage-all.conf.template b/tools-uclibc/stage-all.conf.template |
260 |
index 28bb2d8..ad147a1 100644 |
261 |
--- a/tools-uclibc/stage-all.conf.template |
262 |
+++ b/tools-uclibc/stage-all.conf.template |
263 |
@@ -1,9 +1,9 @@ |
264 |
subarch: SARCH |
265 |
target: CSTAGE |
266 |
version_stamp: uclibc-FLAVOR |
267 |
-rel_type: FLAVOR/SARCH |
268 |
+rel_type: uclibc/FLAVOR/SARCH |
269 |
profile: hardened/linux/uclibc/PARCH |
270 |
snapshot: current |
271 |
-source_subpath: FLAVOR/SARCH/PSTAGE-SARCH-uclibc-FLAVOR |
272 |
+source_subpath: uclibc/FLAVOR/SARCH/PSTAGE-SARCH-uclibc-FLAVOR |
273 |
chost: TARCH-gentoo-linux-uclibc |
274 |
portage_confdir: MYCATALYST/portage.SARCH.FLAVOR |