1 |
commit: a751343297b8f941e170f91e704a51dc3c9b4e30 |
2 |
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Feb 12 04:09:01 2013 +0000 |
4 |
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jan 1 05:58:06 2015 +0000 |
6 |
URL: http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=a7513432 |
7 |
|
8 |
Make shdir a complete path to ease it's use. |
9 |
|
10 |
Add a "shdir" setting to config. |
11 |
This is to make moving the bash code around easier. |
12 |
It also reduces more hardcoded paths in the bash scripts. |
13 |
Migrate all target shell scripts to use the new shdir setting |
14 |
|
15 |
--- |
16 |
etc/catalyst.conf | 8 ++++++-- |
17 |
targets/embedded/embedded-controller.sh | 22 ++++++++++----------- |
18 |
targets/grp/grp-controller.sh | 6 +++--- |
19 |
targets/livecd-stage1/livecd-stage1-controller.sh | 4 ++-- |
20 |
targets/livecd-stage2/livecd-stage2-controller.sh | 22 ++++++++++----------- |
21 |
targets/netboot/netboot-combine.sh | 6 +++--- |
22 |
targets/netboot/netboot-controller.sh | 24 +++++++++++------------ |
23 |
targets/netboot2/netboot2-controller.sh | 16 +++++++-------- |
24 |
targets/stage1/stage1-controller.sh | 8 ++++---- |
25 |
targets/stage2/stage2-controller.sh | 6 +++--- |
26 |
targets/stage3/stage3-controller.sh | 6 +++--- |
27 |
targets/stage4/stage4-controller.sh | 22 ++++++++++----------- |
28 |
targets/support/bootloader-setup.sh | 6 +++--- |
29 |
targets/support/create-iso.sh | 4 ++-- |
30 |
targets/support/functions.sh | 2 +- |
31 |
targets/support/netboot2-final.sh | 4 ++-- |
32 |
targets/support/target_image_setup.sh | 4 ++-- |
33 |
targets/tinderbox/tinderbox-controller.sh | 6 +++--- |
34 |
18 files changed, 90 insertions(+), 86 deletions(-) |
35 |
|
36 |
diff --git a/etc/catalyst.conf b/etc/catalyst.conf |
37 |
index 2d377b2..d52a5c8 100644 |
38 |
--- a/etc/catalyst.conf |
39 |
+++ b/etc/catalyst.conf |
40 |
@@ -73,10 +73,14 @@ options="autoresume bindist kerncache pkgcache seedcache snapcache" |
41 |
# portdir specifies the source portage tree used by the snapshot target. |
42 |
portdir="/usr/portage" |
43 |
|
44 |
-# sharedir specifies where all of the catalyst runtime executables are. Most |
45 |
-# users do not need to change this. |
46 |
+# sharedir specifies where all of the catalyst runtime executables |
47 |
+# and other shared lib objects are. |
48 |
+# Most users do not need to change this. |
49 |
sharedir="/usr/lib/catalyst" |
50 |
|
51 |
+# shdir specifies where all of the catalyst runtime executables are. |
52 |
+shdir="%(sharedir)s/targets" |
53 |
+ |
54 |
# snapshot_cache specifies where the snapshots will be cached to if snapcache is |
55 |
# enabled in the options. |
56 |
snapshot_cache="/var/tmp/catalyst/snapshot_cache" |
57 |
|
58 |
diff --git a/targets/embedded/embedded-controller.sh b/targets/embedded/embedded-controller.sh |
59 |
index 2a0c5fe..c0b62ea 100755 |
60 |
--- a/targets/embedded/embedded-controller.sh |
61 |
+++ b/targets/embedded/embedded-controller.sh |
62 |
@@ -1,7 +1,7 @@ |
63 |
#!/bin/bash |
64 |
|
65 |
-source ${clst_sharedir}/targets/support/functions.sh |
66 |
-source ${clst_sharedir}/targets/support/filesystem-functions.sh |
67 |
+source ${clst_shdir}/support/functions.sh |
68 |
+source ${clst_shdir}/support/filesystem-functions.sh |
69 |
|
70 |
case ${1} in |
71 |
enter) |
72 |
@@ -11,7 +11,7 @@ case ${1} in |
73 |
shift |
74 |
export clst_packages="$*" |
75 |
exec_in_chroot \ |
76 |
- ${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh |
77 |
+ ${clst_shdir}/${clst_target}/${clst_target}-chroot.sh |
78 |
;; |
79 |
|
80 |
preclean) |
81 |
@@ -21,7 +21,7 @@ case ${1} in |
82 |
# export root_fs_path="${clst_chroot_path}/tmp/mergeroot" |
83 |
# install -d ${clst_image_path} |
84 |
|
85 |
-# ${clst_sharedir}/targets/embedded/embedded-fs-runscript.sh \ |
86 |
+# ${clst_shdir}/embedded/embedded-fs-runscript.sh \ |
87 |
# ${clst_embedded_fs_type} || exit 1 |
88 |
# imagesize=`du -sk ${clst_image_path}/root.img | cut -f1` |
89 |
# echo "Created ${clst_embedded_fs_type} image at \ |
90 |
@@ -31,12 +31,12 @@ case ${1} in |
91 |
|
92 |
pre-kmerge) |
93 |
# Sets up the build environment before any kernels are compiled |
94 |
- exec_in_chroot ${clst_sharedir}/targets/support/pre-kmerge.sh |
95 |
+ exec_in_chroot ${clst_shdir}/support/pre-kmerge.sh |
96 |
;; |
97 |
|
98 |
post-kmerge) |
99 |
# Cleans up the build environment after the kernels are compiled |
100 |
- exec_in_chroot ${clst_sharedir}/targets/support/post-kmerge.sh |
101 |
+ exec_in_chroot ${clst_shdir}/support/post-kmerge.sh |
102 |
;; |
103 |
|
104 |
kernel) |
105 |
@@ -47,18 +47,18 @@ case ${1} in |
106 |
then |
107 |
cp -pPR ${clst_linuxrc} ${clst_chroot_path}/tmp/linuxrc |
108 |
fi |
109 |
- exec_in_chroot ${clst_sharedir}/targets/support/kmerge.sh |
110 |
+ exec_in_chroot ${clst_shdir}/support/kmerge.sh |
111 |
delete_from_chroot tmp/linuxrc |
112 |
;; |
113 |
|
114 |
target_image_setup) |
115 |
shift |
116 |
- ${clst_sharedir}/targets/support/target_image_setup.sh ${1} |
117 |
+ ${clst_shdir}/support/target_image_setup.sh ${1} |
118 |
|
119 |
;; |
120 |
livecd-update) |
121 |
# Now, finalize and tweak the livecd fs (inside of the chroot) |
122 |
- exec_in_chroot ${clst_sharedir}/targets/support/livecdfs-update.sh |
123 |
+ exec_in_chroot ${clst_shdir}/support/livecdfs-update.sh |
124 |
;; |
125 |
|
126 |
bootloader) |
127 |
@@ -66,12 +66,12 @@ case ${1} in |
128 |
# Here is where we poke in our identifier |
129 |
touch ${1}/livecd |
130 |
|
131 |
- ${clst_sharedir}/targets/support/bootloader-setup.sh ${1} |
132 |
+ ${clst_shdir}/support/bootloader-setup.sh ${1} |
133 |
;; |
134 |
|
135 |
iso) |
136 |
shift |
137 |
- ${clst_sharedir}/targets/support/create-iso.sh ${1} |
138 |
+ ${clst_shdir}/support/create-iso.sh ${1} |
139 |
;; |
140 |
|
141 |
clean) |
142 |
|
143 |
diff --git a/targets/grp/grp-controller.sh b/targets/grp/grp-controller.sh |
144 |
index 541429a..0f1a5b5 100755 |
145 |
--- a/targets/grp/grp-controller.sh |
146 |
+++ b/targets/grp/grp-controller.sh |
147 |
@@ -1,6 +1,6 @@ |
148 |
#!/bin/bash |
149 |
|
150 |
-source ${clst_sharedir}/targets/support/functions.sh |
151 |
+source ${clst_shdir}/support/functions.sh |
152 |
|
153 |
case $1 in |
154 |
enter) |
155 |
@@ -15,11 +15,11 @@ case $1 in |
156 |
shift |
157 |
|
158 |
export clst_grp_packages="$*" |
159 |
- exec_in_chroot ${clst_sharedir}/targets/grp/grp-chroot.sh |
160 |
+ exec_in_chroot ${clst_shdir}/grp/grp-chroot.sh |
161 |
;; |
162 |
|
163 |
preclean) |
164 |
- exec_in_chroot ${clst_sharedir}/targets/grp/grp-preclean-chroot.sh |
165 |
+ exec_in_chroot ${clst_shdir}/grp/grp-preclean-chroot.sh |
166 |
;; |
167 |
|
168 |
clean) |
169 |
|
170 |
diff --git a/targets/livecd-stage1/livecd-stage1-controller.sh b/targets/livecd-stage1/livecd-stage1-controller.sh |
171 |
index f3b1f40..19b8dd1 100755 |
172 |
--- a/targets/livecd-stage1/livecd-stage1-controller.sh |
173 |
+++ b/targets/livecd-stage1/livecd-stage1-controller.sh |
174 |
@@ -1,5 +1,5 @@ |
175 |
|
176 |
-source ${clst_sharedir}/targets/support/functions.sh |
177 |
+source ${clst_shdir}/support/functions.sh |
178 |
|
179 |
## START RUNSCRIPT |
180 |
|
181 |
@@ -9,7 +9,7 @@ case $1 in |
182 |
export clst_packages="$*" |
183 |
mkdir -p ${clst_chroot_path}/usr/livecd ${clst_chroot_path}/tmp |
184 |
exec_in_chroot \ |
185 |
- ${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh |
186 |
+ ${clst_shdir}/${clst_target}/${clst_target}-chroot.sh |
187 |
echo "${clst_packages}" > ${clst_chroot_path}/tmp/packages.txt |
188 |
;; |
189 |
|
190 |
|
191 |
diff --git a/targets/livecd-stage2/livecd-stage2-controller.sh b/targets/livecd-stage2/livecd-stage2-controller.sh |
192 |
index 57dcff7..a98cb47 100755 |
193 |
--- a/targets/livecd-stage2/livecd-stage2-controller.sh |
194 |
+++ b/targets/livecd-stage2/livecd-stage2-controller.sh |
195 |
@@ -1,16 +1,16 @@ |
196 |
|
197 |
-source ${clst_sharedir}/targets/support/functions.sh |
198 |
-source ${clst_sharedir}/targets/support/filesystem-functions.sh |
199 |
+source ${clst_shdir}/support/functions.sh |
200 |
+source ${clst_shdir}/support/filesystem-functions.sh |
201 |
|
202 |
case $1 in |
203 |
pre-kmerge) |
204 |
# Sets up the build environment before any kernels are compiled |
205 |
- exec_in_chroot ${clst_sharedir}/targets/support/pre-kmerge.sh |
206 |
+ exec_in_chroot ${clst_shdir}/support/pre-kmerge.sh |
207 |
;; |
208 |
|
209 |
post-kmerge) |
210 |
# Cleans up the build environment after the kernels are compiled |
211 |
- exec_in_chroot ${clst_sharedir}/targets/support/post-kmerge.sh |
212 |
+ exec_in_chroot ${clst_shdir}/support/post-kmerge.sh |
213 |
;; |
214 |
|
215 |
kernel) |
216 |
@@ -22,7 +22,7 @@ case $1 in |
217 |
then |
218 |
cp -pPR ${clst_linuxrc} ${clst_chroot_path}/tmp/linuxrc |
219 |
fi |
220 |
- exec_in_chroot ${clst_sharedir}/targets/support/kmerge.sh |
221 |
+ exec_in_chroot ${clst_shdir}/support/kmerge.sh |
222 |
delete_from_chroot tmp/linuxrc |
223 |
|
224 |
extract_modules ${clst_chroot_path} ${clst_kname} |
225 |
@@ -79,7 +79,7 @@ case $1 in |
226 |
|
227 |
livecd-update) |
228 |
# Now, finalize and tweak the livecd fs (inside of the chroot) |
229 |
- exec_in_chroot ${clst_sharedir}/targets/support/livecdfs-update.sh |
230 |
+ exec_in_chroot ${clst_shdir}/support/livecdfs-update.sh |
231 |
|
232 |
# Move over the xinitrc (if applicable) |
233 |
# This is moved here, so we can override any default xinitrc |
234 |
@@ -92,7 +92,7 @@ case $1 in |
235 |
;; |
236 |
|
237 |
rc-update) |
238 |
- exec_in_chroot ${clst_sharedir}/targets/support/rc-update.sh |
239 |
+ exec_in_chroot ${clst_shdir}/support/rc-update.sh |
240 |
;; |
241 |
|
242 |
fsscript) |
243 |
@@ -182,23 +182,23 @@ case $1 in |
244 |
;; |
245 |
esac |
246 |
|
247 |
- ${clst_sharedir}/targets/support/bootloader-setup.sh $1 |
248 |
+ ${clst_shdir}/support/bootloader-setup.sh $1 |
249 |
;; |
250 |
|
251 |
unmerge) |
252 |
shift |
253 |
export clst_packages="$*" |
254 |
- exec_in_chroot ${clst_sharedir}/targets/support/unmerge.sh |
255 |
+ exec_in_chroot ${clst_shdir}/support/unmerge.sh |
256 |
;; |
257 |
|
258 |
target_image_setup) |
259 |
shift |
260 |
- ${clst_sharedir}/targets/support/target_image_setup.sh $1 |
261 |
+ ${clst_shdir}/support/target_image_setup.sh $1 |
262 |
;; |
263 |
|
264 |
iso) |
265 |
shift |
266 |
- ${clst_sharedir}/targets/support/create-iso.sh $1 |
267 |
+ ${clst_shdir}/support/create-iso.sh $1 |
268 |
;; |
269 |
esac |
270 |
exit $? |
271 |
|
272 |
diff --git a/targets/netboot/netboot-combine.sh b/targets/netboot/netboot-combine.sh |
273 |
index e4294ca..d5312fb 100755 |
274 |
--- a/targets/netboot/netboot-combine.sh |
275 |
+++ b/targets/netboot/netboot-combine.sh |
276 |
@@ -1,8 +1,8 @@ |
277 |
#!/bin/bash |
278 |
|
279 |
-source ${clst_sharedir}/targets/support/chroot-functions.sh |
280 |
-source ${clst_sharedir}/targets/support/functions.sh |
281 |
-source ${clst_sharedir}/targets/support/filesystem-functions.sh |
282 |
+source ${clst_shdir}/support/chroot-functions.sh |
283 |
+source ${clst_shdir}/support/functions.sh |
284 |
+source ${clst_shdir}/support/filesystem-functions.sh |
285 |
|
286 |
update_env_settings |
287 |
|
288 |
|
289 |
diff --git a/targets/netboot/netboot-controller.sh b/targets/netboot/netboot-controller.sh |
290 |
index edf1f21..93feb26 100755 |
291 |
--- a/targets/netboot/netboot-controller.sh |
292 |
+++ b/targets/netboot/netboot-controller.sh |
293 |
@@ -1,7 +1,7 @@ |
294 |
#!/bin/bash |
295 |
|
296 |
-source ${clst_sharedir}/targets/support/functions.sh |
297 |
-source ${clst_sharedir}/targets/support/filesystem-functions.sh |
298 |
+source ${clst_shdir}/support/functions.sh |
299 |
+source ${clst_shdir}/support/filesystem-functions.sh |
300 |
|
301 |
|
302 |
case ${1} in |
303 |
@@ -11,7 +11,7 @@ case ${1} in |
304 |
clst_root_path="/" \ |
305 |
clst_packages="$*" \ |
306 |
exec_in_chroot \ |
307 |
- ${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh |
308 |
+ ${clst_shdir}/${clst_target}/${clst_target}-chroot.sh |
309 |
;; |
310 |
|
311 |
busybox) |
312 |
@@ -30,26 +30,26 @@ case ${1} in |
313 |
clst_myemergeopts="${clst_myemergeopts} -O" \ |
314 |
clst_packages="busybox" \ |
315 |
exec_in_chroot \ |
316 |
- ${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh |
317 |
+ ${clst_shdir}/${clst_target}/${clst_target}-chroot.sh |
318 |
;; |
319 |
|
320 |
pre-kmerge) |
321 |
# Sets up the build environment before any kernels are compiled |
322 |
- #exec_in_chroot ${clst_sharedir}/targets/support/pre-kmerge.sh |
323 |
+ #exec_in_chroot ${clst_shdir}/support/pre-kmerge.sh |
324 |
;; |
325 |
|
326 |
post-kmerge) |
327 |
# Cleans up the build environment after the kernels are compiled |
328 |
- #exec_in_chroot ${clst_sharedir}/targets/support/post-kmerge.sh |
329 |
+ #exec_in_chroot ${clst_shdir}/support/post-kmerge.sh |
330 |
;; |
331 |
|
332 |
kernel) |
333 |
shift |
334 |
export clst_kname="$1" |
335 |
export clst_root_path="/" |
336 |
- #exec_in_chroot ${clst_sharedir}/targets/support/pre-kmerge.sh |
337 |
- #exec_in_chroot ${clst_sharedir}/targets/support/kmerge.sh |
338 |
- #exec_in_chroot ${clst_sharedir}/targets/support/post-kmerge.sh |
339 |
+ #exec_in_chroot ${clst_shdir}/support/pre-kmerge.sh |
340 |
+ #exec_in_chroot ${clst_shdir}/support/kmerge.sh |
341 |
+ #exec_in_chroot ${clst_shdir}/support/post-kmerge.sh |
342 |
#extract_kernels kernels |
343 |
;; |
344 |
|
345 |
@@ -61,15 +61,15 @@ case ${1} in |
346 |
clst_myemergeopts="${clst_myemergeopts} --nodeps" \ |
347 |
clst_packages="netboot-base" \ |
348 |
exec_in_chroot \ |
349 |
- ${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh |
350 |
+ ${clst_shdir}/${clst_target}/${clst_target}-chroot.sh |
351 |
|
352 |
clst_files="${@}" \ |
353 |
exec_in_chroot \ |
354 |
- ${clst_sharedir}/targets/${clst_target}/${clst_target}-image.sh |
355 |
+ ${clst_shdir}/${clst_target}/${clst_target}-image.sh |
356 |
;; |
357 |
|
358 |
finish) |
359 |
- ${clst_sharedir}/targets/${clst_target}/${clst_target}-combine.sh |
360 |
+ ${clst_shdir}/${clst_target}/${clst_target}-combine.sh |
361 |
;; |
362 |
|
363 |
clean) |
364 |
|
365 |
diff --git a/targets/netboot2/netboot2-controller.sh b/targets/netboot2/netboot2-controller.sh |
366 |
index 2ffcb0d..be5f91d 100755 |
367 |
--- a/targets/netboot2/netboot2-controller.sh |
368 |
+++ b/targets/netboot2/netboot2-controller.sh |
369 |
@@ -1,7 +1,7 @@ |
370 |
#!/bin/bash |
371 |
|
372 |
-source ${clst_sharedir}/targets/support/functions.sh |
373 |
-source ${clst_sharedir}/targets/support/filesystem-functions.sh |
374 |
+source ${clst_shdir}/support/functions.sh |
375 |
+source ${clst_shdir}/support/filesystem-functions.sh |
376 |
|
377 |
case ${1} in |
378 |
build_packages) |
379 |
@@ -10,17 +10,17 @@ case ${1} in |
380 |
clst_root_path="/" \ |
381 |
clst_packages="$*" \ |
382 |
exec_in_chroot \ |
383 |
- ${clst_sharedir}/targets/${clst_target}/${clst_target}-pkg.sh |
384 |
+ ${clst_shdir}/${clst_target}/${clst_target}-pkg.sh |
385 |
;; |
386 |
|
387 |
pre-kmerge) |
388 |
# Sets up the build environment before any kernels are compiled |
389 |
- exec_in_chroot ${clst_sharedir}/targets/support/pre-kmerge.sh |
390 |
+ exec_in_chroot ${clst_shdir}/support/pre-kmerge.sh |
391 |
;; |
392 |
|
393 |
post-kmerge) |
394 |
# Cleans up the build environment after the kernels are compiled |
395 |
- exec_in_chroot ${clst_sharedir}/targets/support/post-kmerge.sh |
396 |
+ exec_in_chroot ${clst_shdir}/support/post-kmerge.sh |
397 |
;; |
398 |
|
399 |
kernel) |
400 |
@@ -37,7 +37,7 @@ case ${1} in |
401 |
cp ${clst_busybox_config} ${clst_chroot_path}/tmp/busy-config |
402 |
fi |
403 |
|
404 |
- exec_in_chroot ${clst_sharedir}/targets/support/kmerge.sh |
405 |
+ exec_in_chroot ${clst_shdir}/support/kmerge.sh |
406 |
|
407 |
delete_from_chroot tmp/linuxrc |
408 |
delete_from_chroot tmp/busy-config |
409 |
@@ -56,13 +56,13 @@ case ${1} in |
410 |
# Copy remaining files over to the initramfs target |
411 |
clst_files="${@}" \ |
412 |
exec_in_chroot \ |
413 |
- ${clst_sharedir}/targets/${clst_target}/${clst_target}-copyfile.sh |
414 |
+ ${clst_shdir}/${clst_target}/${clst_target}-copyfile.sh |
415 |
;; |
416 |
|
417 |
final) |
418 |
# For each arch, fetch the kernel images and put them in builds/ |
419 |
echo -e ">>> Copying completed kernels to ${clst_target_path} ..." |
420 |
- ${clst_sharedir}/targets/support/netboot2-final.sh |
421 |
+ ${clst_shdir}/support/netboot2-final.sh |
422 |
;; |
423 |
|
424 |
clean) |
425 |
|
426 |
diff --git a/targets/stage1/stage1-controller.sh b/targets/stage1/stage1-controller.sh |
427 |
index d029545..09a121d 100755 |
428 |
--- a/targets/stage1/stage1-controller.sh |
429 |
+++ b/targets/stage1/stage1-controller.sh |
430 |
@@ -1,13 +1,13 @@ |
431 |
#!/bin/bash |
432 |
|
433 |
-source ${clst_sharedir}/targets/support/functions.sh |
434 |
+source ${clst_shdir}/support/functions.sh |
435 |
|
436 |
case $1 in |
437 |
enter) |
438 |
;; |
439 |
|
440 |
run) |
441 |
- cp ${clst_sharedir}/targets/stage1/build.py ${clst_chroot_path}/tmp |
442 |
+ cp ${clst_shdir}/stage1/build.py ${clst_chroot_path}/tmp |
443 |
|
444 |
# Setup "ROOT in chroot" dir |
445 |
install -d ${clst_chroot_path}${clst_root_path}/etc |
446 |
@@ -18,12 +18,12 @@ case $1 in |
447 |
|
448 |
# Enter chroot, execute our build script |
449 |
exec_in_chroot \ |
450 |
- ${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh \ |
451 |
+ ${clst_shdir}/${clst_target}/${clst_target}-chroot.sh \ |
452 |
|| exit 1 |
453 |
;; |
454 |
|
455 |
preclean) |
456 |
- exec_in_chroot ${clst_sharedir}/targets/${clst_target}/${clst_target}-preclean-chroot.sh || exit 1 |
457 |
+ exec_in_chroot ${clst_shdir}/${clst_target}/${clst_target}-preclean-chroot.sh || exit 1 |
458 |
;; |
459 |
|
460 |
clean) |
461 |
|
462 |
diff --git a/targets/stage2/stage2-controller.sh b/targets/stage2/stage2-controller.sh |
463 |
index 69ba7c9..25e5120 100755 |
464 |
--- a/targets/stage2/stage2-controller.sh |
465 |
+++ b/targets/stage2/stage2-controller.sh |
466 |
@@ -1,6 +1,6 @@ |
467 |
#!/bin/bash |
468 |
|
469 |
-source ${clst_sharedir}/targets/support/functions.sh |
470 |
+source ${clst_shdir}/support/functions.sh |
471 |
|
472 |
# Only put commands in this section that you want every target to execute. |
473 |
# This is a global default file and will affect every target |
474 |
@@ -13,11 +13,11 @@ case $1 in |
475 |
shift |
476 |
export clst_packages="$*" |
477 |
exec_in_chroot \ |
478 |
- ${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh |
479 |
+ ${clst_shdir}/${clst_target}/${clst_target}-chroot.sh |
480 |
;; |
481 |
|
482 |
preclean) |
483 |
- exec_in_chroot ${clst_sharedir}/targets/${clst_target}/${clst_target}-preclean-chroot.sh |
484 |
+ exec_in_chroot ${clst_shdir}/${clst_target}/${clst_target}-preclean-chroot.sh |
485 |
;; |
486 |
|
487 |
clean) |
488 |
|
489 |
diff --git a/targets/stage3/stage3-controller.sh b/targets/stage3/stage3-controller.sh |
490 |
index ff546f8..df1479e 100755 |
491 |
--- a/targets/stage3/stage3-controller.sh |
492 |
+++ b/targets/stage3/stage3-controller.sh |
493 |
@@ -1,6 +1,6 @@ |
494 |
#!/bin/bash |
495 |
|
496 |
-source ${clst_sharedir}/targets/support/functions.sh |
497 |
+source ${clst_shdir}/support/functions.sh |
498 |
|
499 |
# Only put commands in this section that you want every target to execute. |
500 |
# This is a global default file and will affect every target |
501 |
@@ -12,11 +12,11 @@ case $1 in |
502 |
run) |
503 |
shift |
504 |
export clst_packages="$*" |
505 |
- exec_in_chroot ${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh |
506 |
+ exec_in_chroot ${clst_shdir}/${clst_target}/${clst_target}-chroot.sh |
507 |
;; |
508 |
|
509 |
preclean) |
510 |
- exec_in_chroot ${clst_sharedir}/targets/${clst_target}/${clst_target}-preclean-chroot.sh |
511 |
+ exec_in_chroot ${clst_shdir}/${clst_target}/${clst_target}-preclean-chroot.sh |
512 |
;; |
513 |
|
514 |
clean) |
515 |
|
516 |
diff --git a/targets/stage4/stage4-controller.sh b/targets/stage4/stage4-controller.sh |
517 |
index ff8dc03..d42f302 100755 |
518 |
--- a/targets/stage4/stage4-controller.sh |
519 |
+++ b/targets/stage4/stage4-controller.sh |
520 |
@@ -1,6 +1,6 @@ |
521 |
#!/bin/bash |
522 |
|
523 |
-source ${clst_sharedir}/targets/support/functions.sh |
524 |
+source ${clst_shdir}/support/functions.sh |
525 |
|
526 |
# Only put commands in this section that you want every target to execute. |
527 |
# This is a global default file and will affect every target |
528 |
@@ -11,12 +11,12 @@ case $1 in |
529 |
|
530 |
pre-kmerge) |
531 |
# Sets up the build environment before any kernels are compiled |
532 |
- exec_in_chroot ${clst_sharedir}/targets/support/pre-kmerge.sh |
533 |
+ exec_in_chroot ${clst_shdir}/support/pre-kmerge.sh |
534 |
;; |
535 |
|
536 |
post-kmerge) |
537 |
# Cleans up the build environment after the kernels are compiled |
538 |
- exec_in_chroot ${clst_sharedir}/targets/support/post-kmerge.sh |
539 |
+ exec_in_chroot ${clst_shdir}/support/post-kmerge.sh |
540 |
;; |
541 |
|
542 |
kernel) |
543 |
@@ -27,7 +27,7 @@ case $1 in |
544 |
then |
545 |
cp -pPR ${clst_linuxrc} ${clst_chroot_path}/tmp/linuxrc |
546 |
fi |
547 |
- exec_in_chroot ${clst_sharedir}/targets/support/kmerge.sh |
548 |
+ exec_in_chroot ${clst_shdir}/support/kmerge.sh |
549 |
delete_from_chroot tmp/linuxrc |
550 |
extract_modules ${clst_chroot_path} ${clst_kname} |
551 |
# Do we need this one? |
552 |
@@ -37,15 +37,15 @@ case $1 in |
553 |
build_packages) |
554 |
shift |
555 |
export clst_packages="$*" |
556 |
- exec_in_chroot ${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh |
557 |
+ exec_in_chroot ${clst_shdir}/${clst_target}/${clst_target}-chroot.sh |
558 |
;; |
559 |
|
560 |
preclean) |
561 |
- exec_in_chroot ${clst_sharedir}/targets/${clst_target}/${clst_target}-preclean-chroot.sh ${clst_root_path} |
562 |
+ exec_in_chroot ${clst_shdir}/${clst_target}/${clst_target}-preclean-chroot.sh ${clst_root_path} |
563 |
;; |
564 |
|
565 |
rc-update) |
566 |
- exec_in_chroot ${clst_sharedir}/targets/support/rc-update.sh |
567 |
+ exec_in_chroot ${clst_shdir}/support/rc-update.sh |
568 |
;; |
569 |
|
570 |
fsscript) |
571 |
@@ -54,7 +54,7 @@ case $1 in |
572 |
|
573 |
livecd-update) |
574 |
# Now, finalize and tweak the livecd fs (inside of the chroot) |
575 |
- exec_in_chroot ${clst_sharedir}/targets/support/livecdfs-update.sh |
576 |
+ exec_in_chroot ${clst_shdir}/support/livecdfs-update.sh |
577 |
|
578 |
# Move over the xinitrc (if applicable) |
579 |
# This is moved here, so we can override any default xinitrc |
580 |
@@ -71,18 +71,18 @@ case $1 in |
581 |
|
582 |
target_image_setup) |
583 |
shift |
584 |
- ${clst_sharedir}/targets/support/target_image_setup.sh $1 |
585 |
+ ${clst_shdir}/support/target_image_setup.sh $1 |
586 |
;; |
587 |
|
588 |
unmerge) |
589 |
shift |
590 |
export clst_packages="$*" |
591 |
- exec_in_chroot ${clst_sharedir}/targets/support/unmerge.sh |
592 |
+ exec_in_chroot ${clst_shdir}/support/unmerge.sh |
593 |
;; |
594 |
|
595 |
iso) |
596 |
shift |
597 |
- ${clst_sharedir}/targets/support/create-iso.sh $1 |
598 |
+ ${clst_shdir}/support/create-iso.sh $1 |
599 |
;; |
600 |
|
601 |
clean) |
602 |
|
603 |
diff --git a/targets/support/bootloader-setup.sh b/targets/support/bootloader-setup.sh |
604 |
index a0bc5f5..857ce6f 100755 |
605 |
--- a/targets/support/bootloader-setup.sh |
606 |
+++ b/targets/support/bootloader-setup.sh |
607 |
@@ -1,7 +1,7 @@ |
608 |
#!/bin/bash |
609 |
|
610 |
-source ${clst_sharedir}/targets/support/functions.sh |
611 |
-source ${clst_sharedir}/targets/support/filesystem-functions.sh |
612 |
+source ${clst_shdir}/support/functions.sh |
613 |
+source ${clst_shdir}/support/filesystem-functions.sh |
614 |
|
615 |
# $1 is the destination root |
616 |
|
617 |
@@ -455,7 +455,7 @@ case ${clst_hostarch} in |
618 |
[ -d "${1}/boot" ] && rmdir ${1}/boot |
619 |
|
620 |
# Source the arcload source file to generated required sections of arc.cf |
621 |
- source ${clst_sharedir}/targets/support/mips-arcload_conf.sh |
622 |
+ source ${clst_shdir}/support/mips-arcload_conf.sh |
623 |
|
624 |
# Generate top portions of the config |
625 |
echo -e "${topofconfig}${serial}${dbg}${cmt1}" >> ${scratch}/arc.cf |
626 |
|
627 |
diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh |
628 |
index d4fd834..0a70512 100755 |
629 |
--- a/targets/support/create-iso.sh |
630 |
+++ b/targets/support/create-iso.sh |
631 |
@@ -1,7 +1,7 @@ |
632 |
#!/bin/bash |
633 |
|
634 |
-source ${clst_sharedir}/targets/support/functions.sh |
635 |
-source ${clst_sharedir}/targets/support/filesystem-functions.sh |
636 |
+source ${clst_shdir}/support/functions.sh |
637 |
+source ${clst_shdir}/support/filesystem-functions.sh |
638 |
|
639 |
## START RUNSCRIPT |
640 |
|
641 |
|
642 |
diff --git a/targets/support/functions.sh b/targets/support/functions.sh |
643 |
index 0894b35..9419b2b 100755 |
644 |
--- a/targets/support/functions.sh |
645 |
+++ b/targets/support/functions.sh |
646 |
@@ -24,7 +24,7 @@ exec_in_chroot(){ |
647 |
|
648 |
echo "Copying ${file_name} to ${destdir}" |
649 |
copy_to_chroot ${1} ${destdir} |
650 |
- copy_to_chroot ${clst_sharedir}/targets/support/chroot-functions.sh \ |
651 |
+ copy_to_chroot ${clst_shdir}/support/chroot-functions.sh \ |
652 |
${destdir} |
653 |
|
654 |
chroot_path=${clst_chroot_path}${subdir} |
655 |
|
656 |
diff --git a/targets/support/netboot2-final.sh b/targets/support/netboot2-final.sh |
657 |
index 53a0670..3a872a9 100755 |
658 |
--- a/targets/support/netboot2-final.sh |
659 |
+++ b/targets/support/netboot2-final.sh |
660 |
@@ -1,7 +1,7 @@ |
661 |
#!/bin/bash |
662 |
|
663 |
-source ${clst_sharedir}/targets/support/functions.sh |
664 |
-source ${clst_sharedir}/targets/support/filesystem-functions.sh |
665 |
+source ${clst_shdir}/support/functions.sh |
666 |
+source ${clst_shdir}/support/filesystem-functions.sh |
667 |
|
668 |
|
669 |
extract_kernels ${clst_target_path}boot |
670 |
|
671 |
diff --git a/targets/support/target_image_setup.sh b/targets/support/target_image_setup.sh |
672 |
index b9e2781..b428d4e 100755 |
673 |
--- a/targets/support/target_image_setup.sh |
674 |
+++ b/targets/support/target_image_setup.sh |
675 |
@@ -1,6 +1,6 @@ |
676 |
|
677 |
-source ${clst_sharedir}/targets/support/functions.sh |
678 |
-source ${clst_sharedir}/targets/support/filesystem-functions.sh |
679 |
+source ${clst_shdir}/support/functions.sh |
680 |
+source ${clst_shdir}/support/filesystem-functions.sh |
681 |
|
682 |
# Make the directory if it doesnt exist |
683 |
mkdir -p $1 |
684 |
|
685 |
diff --git a/targets/tinderbox/tinderbox-controller.sh b/targets/tinderbox/tinderbox-controller.sh |
686 |
index d7d89cb..3dbc76f 100755 |
687 |
--- a/targets/tinderbox/tinderbox-controller.sh |
688 |
+++ b/targets/tinderbox/tinderbox-controller.sh |
689 |
@@ -1,14 +1,14 @@ |
690 |
#!/bin/bash |
691 |
|
692 |
-source ${clst_sharedir}/targets/support/functions.sh |
693 |
+source ${clst_shdir}/support/functions.sh |
694 |
|
695 |
case $1 in |
696 |
run) |
697 |
shift |
698 |
- exec_in_chroot ${clst_sharedir}/targets/tinderbox/tinderbox-chroot.sh |
699 |
+ exec_in_chroot ${clst_shdir}/tinderbox/tinderbox-chroot.sh |
700 |
;; |
701 |
preclean) |
702 |
- #exec_in_chroot ${clst_sharedir}/targets/tinderbox/tinderbox-preclean-chroot.sh |
703 |
+ #exec_in_chroot ${clst_shdir}/tinderbox/tinderbox-preclean-chroot.sh |
704 |
delete_from_chroot /tmp/chroot-functions.sh |
705 |
;; |
706 |
clean) |