1 |
Index: tools/gnap_shared.sh |
2 |
=================================================================== |
3 |
--- tools/gnap_shared.sh (revision 73) |
4 |
+++ tools/gnap_shared.sh (working copy) |
5 |
@@ -1,23 +1,24 @@ |
6 |
-GNAPNAME=$(basename "$0") |
7 |
+GNAP_NAME=$(basename "$0") |
8 |
|
9 |
-case ${GNAPNAME} in |
10 |
- gnap_make ) GNAPPRODUCT="Build";; |
11 |
- gnap_overlay ) GNAPPRODUCT="Overlay";; |
12 |
- gnap_remaster ) GNAPPRODUCT="Remaster";; |
13 |
- * ) GNAPPRODUCT="Something";; |
14 |
+case ${GNAP_NAME} in |
15 |
+ gnap_make ) GNAP_PRODUCT="Build";; |
16 |
+ gnap_overlay ) GNAP_PRODUCT="Overlay";; |
17 |
+ gnap_remaster ) GNAP_PRODUCT="Remaster";; |
18 |
+ * ) GNAP_PRODUCT="Something";; |
19 |
esac |
20 |
|
21 |
-GNAPLIBDIR='/usr/lib/gnap' |
22 |
-STAGE3FILE="${GNAPLIBDIR}/gnap-stage3seed.tar.bz2" |
23 |
-SNAPSHOTFILE="${GNAPLIBDIR}/gnap-portagesnapshot.tar.bz2" |
24 |
-SPECS="${GNAPLIBDIR}/gnap-specs.tar.bz2" |
25 |
-GNAPCORE="${GNAPLIBDIR}/gnap-core.tar" |
26 |
-GNAPMBR="${GNAPLIBDIR}/mbr/mbr.bin" |
27 |
-GNAPEXTDIR="${GNAPLIBDIR}/extensions" |
28 |
-GNAPBASEFS="${GNAPLIBDIR}/gnap-basefs.tar.bz2" |
29 |
+GNAP_LIBDIR='/usr/lib/gnap' |
30 |
+GNAP_STAGE3FILE="${GNAP_LIBDIR}/gnap-stage3seed.tar.bz2" |
31 |
+GNAP_SNAPSHOTFILE="${GNAP_LIBDIR}/gnap-portagesnapshot.tar.bz2" |
32 |
+GNAP_SPECS="${GNAP_LIBDIR}/gnap-specs.tar.bz2" |
33 |
+GNAP_CORE="${GNAP_LIBDIR}/gnap-core.tar" |
34 |
+GNAP_MBR="${GNAP_LIBDIR}/mbr/mbr.bin" |
35 |
+GNAP_EXTDIR="${GNAP_LIBDIR}/extensions" |
36 |
+GNAP_BASEFS="${GNAP_LIBDIR}/gnap-basefs.tar.bz2" |
37 |
+GNAP_TEMPDIR='' |
38 |
|
39 |
-TEMPDIR='' |
40 |
LOOP='' |
41 |
+FORCEYES=0 |
42 |
|
43 |
G=$'\e[32;01m' |
44 |
B=$'\e[31;01m' |
45 |
@@ -37,10 +38,10 @@ |
46 |
else |
47 |
read -ep " ${W}*${N} ${*} [N]: " answer |
48 |
if [[ "${answer}" != 'y' && "${answer}" != 'Y' ]]; then |
49 |
- if [[ -n "${TEMPDIR}" ]]; then |
50 |
+ if [[ -n "${GNAP_TEMPDIR}" ]]; then |
51 |
cleanup |
52 |
fi |
53 |
- echo "${GNAPPRODUCT} aborted !" |
54 |
+ echo "${GNAP_PRODUCT} aborted !" |
55 |
exit 2 |
56 |
fi |
57 |
fi |
58 |
@@ -67,10 +68,10 @@ |
59 |
echo -en " ${B}*${N} ${*}" |
60 |
echo -e "${E} ${K}[ ${B}!!${K} ]${N}" |
61 |
fi |
62 |
- if [[ -n "${TEMPDIR}" ]]; then |
63 |
+ if [[ -n "${GNAP_TEMPDIR}" ]]; then |
64 |
cleanup |
65 |
fi |
66 |
- echo "${GNAPPRODUCT} failed, try ${GNAPNAME} -h for more help" |
67 |
+ echo "${GNAP_PRODUCT} failed, try ${GNAP_NAME} -h for help" |
68 |
exit 1 |
69 |
fi |
70 |
} |
71 |
@@ -82,9 +83,9 @@ |
72 |
gtest $? "Failed to unmount ${LOOP}" |
73 |
fi |
74 |
gbegin 'Cleaning temporary directories' |
75 |
- if [[ -d "${TEMPDIR}" ]]; then |
76 |
- DIRTOREMOVE="${TEMPDIR}" |
77 |
- TEMPDIR='' |
78 |
+ if [[ -d "${GNAP_TEMPDIR}" ]]; then |
79 |
+ DIRTOREMOVE="${GNAP_TEMPDIR}" |
80 |
+ GNAP_TEMPDIR='' |
81 |
rm -rf "${DIRTOREMOVE}" |
82 |
gtest $? "Failed to remove ${DIRTOREMOVE}" |
83 |
else |
84 |
@@ -93,13 +94,13 @@ |
85 |
} |
86 |
|
87 |
make_tempdir() { |
88 |
- if [[ "${TEMPDIR}" = "" ]]; then |
89 |
- TEMPDIR=$(mktemp -d -t gnap_make.XXXXXX) |
90 |
+ if [[ "${GNAP_TEMPDIR}" = "" ]]; then |
91 |
+ GNAP_TEMPDIR=$(mktemp -d -t gnap_make.XXXXXX) |
92 |
gtest continued $? 'Failed to create temporary directory' |
93 |
- elif [[ -d "${TEMPDIR}" ]] |
94 |
- gconfirm "${TEMPDIR} already exists. Continue?" |
95 |
+ elif [[ -d "${GNAP_TEMPDIR}" ]] |
96 |
+ gconfirm "${GNAP_TEMPDIR} already exists. Continue?" |
97 |
else |
98 |
- mkdir -p "${TEMPDIR}" |
99 |
- gtest continued $? "Failed to create ${TEMPDIR}" |
100 |
+ mkdir -p "${GNAP_TEMPDIR}" |
101 |
+ gtest continued $? "Failed to create ${GNAP_TEMPDIR}" |
102 |
fi |
103 |
} |
104 |
Index: tools/gnap_overlay |
105 |
=================================================================== |
106 |
--- tools/gnap_overlay (revision 73) |
107 |
+++ tools/gnap_overlay (working copy) |
108 |
@@ -2,15 +2,15 @@ |
109 |
VERSION='2.0' |
110 |
|
111 |
source "gnap_shared.sh" |
112 |
-echo "GNAP overlay tool ${GNAPNAME} ${VERSION}" |
113 |
+echo "GNAP overlay tool ${GNAP_NAME} ${VERSION}" |
114 |
|
115 |
IMG_SIZE=15 |
116 |
|
117 |
usage() { |
118 |
echo |
119 |
echo 'Usage:' |
120 |
- echo " ${GNAPNAME} -i isoname -o overlay [ options ]" |
121 |
- echo " ${GNAPNAME} -d hostdisk -r rootdev -o overlay [ options ]" |
122 |
+ echo " ${GNAP_NAME} -i isoname -o overlay [ options ]" |
123 |
+ echo " ${GNAP_NAME} -d hostdisk -r rootdev -o overlay [ options ]" |
124 |
echo |
125 |
echo 'Common options:' |
126 |
echo ' -o overlay Overlay directory or tbz2 file' |
127 |
@@ -36,7 +36,7 @@ |
128 |
echo ' -S size Size of image file in megabyte' |
129 |
echo ' The disk target options also apply, except -d.' |
130 |
echo |
131 |
- echo "Please man ${GNAPNAME} for more details." |
132 |
+ echo "Run man ${GNAP_NAME} for more details." |
133 |
} |
134 |
|
135 |
if [[ "$#" -eq 0 || "${1}" == '-h' ]]; then |
136 |
@@ -47,11 +47,21 @@ |
137 |
gbegin 'Checking parameters' |
138 |
|
139 |
# Read options |
140 |
+OVERLAYS='' |
141 |
+OVERLAYCONF='' |
142 |
+NOLOGO=0 |
143 |
+OUTPUT='' |
144 |
+TYPE='' |
145 |
+CREATE='' |
146 |
+TARGETROOT='' |
147 |
+CACHE='' |
148 |
+SERIAL='' |
149 |
+BAUDRATE='' |
150 |
while getopts ':hg:o:c:nfi:d:l:r:ms:S:L:T:' options; do |
151 |
case ${options} in |
152 |
h ) usage |
153 |
exit 0;; |
154 |
- g ) GNAPCORE="${OPTARG}";; |
155 |
+ g ) GNAP_CORE="${OPTARG}";; |
156 |
o ) OVERLAYS="${OVERLAYS} ${OPTARG}";; |
157 |
c ) OVERLAYCONF="${OPTARG}";; |
158 |
n ) NOLOGO=1;; |
159 |
@@ -71,7 +81,7 @@ |
160 |
m ) CACHE='docache ';; |
161 |
s ) SERIAL="console=ttyS0,${OPTARG}n81" |
162 |
BAUDRATE="${OPTARG}";; |
163 |
- T ) TEMPDIR="${OPTARG}";; |
164 |
+ T ) GNAP_TEMPDIR="${OPTARG}";; |
165 |
* ) gtest 1 'Specified options are incomplete or unknown !';; |
166 |
esac |
167 |
done |
168 |
@@ -81,7 +91,7 @@ |
169 |
gtest continued $? 'Please specify a target (-i or -d option)' |
170 |
|
171 |
# Core file is required |
172 |
-test -f "${GNAPCORE}" |
173 |
+test -f "${GNAP_CORE}" |
174 |
gtest continued $? 'Please specify a valid GNAP core file (-g option)' |
175 |
|
176 |
case "${TYPE}" in |
177 |
@@ -111,7 +121,7 @@ |
178 |
gwarn 'Warning : you have selected disk install' |
179 |
gwarn "Make sure you are root or have full access to ${OUTPUT}" |
180 |
gwarn "${PARENTDEV} must have an MBR installed, run:" |
181 |
- gwarn "${W}dd if=${GNAPMBR} of=${PARENTDEV} bs=512 count=1${N} if needed" |
182 |
+ gwarn "${W}dd if=${GNAP_MBR} of=${PARENTDEV} bs=512 count=1${N} if needed" |
183 |
gwarn "${OUTPUT} must contain an active partition:" |
184 |
gwarn " use ${W}fdisk ${PARENTDEV}${N} if needed" |
185 |
gwarn "Current data on ${OUTPUT} will be ${B}destroyed${N} !" |
186 |
@@ -122,15 +132,15 @@ |
187 |
make_tempdir |
188 |
|
189 |
# Common actions |
190 |
-gbegin "Expanding ${GNAPCORE} core" |
191 |
-TEMPCOREDIR="${TEMPDIR}/core" |
192 |
+gbegin "Expanding ${GNAP_CORE} core" |
193 |
+TEMPCOREDIR="${GNAP_TEMPDIR}/core" |
194 |
mkdir "${TEMPCOREDIR}" |
195 |
gtest continued $? 'Failed to create core temporary subdirectory' |
196 |
-tar x -C "${TEMPCOREDIR}" -f "${GNAPCORE}" |
197 |
+tar x -C "${TEMPCOREDIR}" -f "${GNAP_CORE}" |
198 |
gtest $? 'Failed to extract core' |
199 |
|
200 |
gbegin 'Preparing overlay' |
201 |
-TEMPOVERDIR="${TEMPDIR}/overlay" |
202 |
+TEMPOVERDIR="${GNAP_TEMPDIR}/overlay" |
203 |
mkdir "${TEMPOVERDIR}" |
204 |
gtest $? 'Failed to create overlay temporary subdirectory' |
205 |
|
206 |
@@ -250,7 +260,7 @@ |
207 |
gtest $? |
208 |
|
209 |
gbegin "Mounting ${OUTPUT}" |
210 |
- TEMPMOUNTDIR="${TEMPDIR}/mount" |
211 |
+ TEMPMOUNTDIR="${GNAP_TEMPDIR}/mount" |
212 |
mkdir "${TEMPMOUNTDIR}" |
213 |
gtest continued $? 'Failed to create mount temporary subdirectory' |
214 |
mount -t msdos "${OUTPUT}" "${TEMPMOUNTDIR}" |
215 |
@@ -289,7 +299,7 @@ |
216 |
image) |
217 |
gbegin 'Preparing disk for boot' |
218 |
syslinux -o "${offset}" "${ORIG_OUTPUT}" && \ |
219 |
- dd if="${GNAPMBR}" of="${ORIG_OUTPUT}" bs=512 count=1 \ |
220 |
+ dd if="${GNAP_MBR}" of="${ORIG_OUTPUT}" bs=512 count=1 \ |
221 |
conv=notrunc >/dev/null 2>&1 |
222 |
gtest $? |
223 |
;; |
224 |
@@ -298,5 +308,5 @@ |
225 |
|
226 |
# Successful finish |
227 |
cleanup |
228 |
-echo 'Overlay successful !' |
229 |
+echo "${GNAP_PRODUCT} successful !" |
230 |
exit 0 |
231 |
Index: tools/gnap_remaster |
232 |
=================================================================== |
233 |
--- tools/gnap_remaster (revision 73) |
234 |
+++ tools/gnap_remaster (working copy) |
235 |
@@ -2,14 +2,14 @@ |
236 |
VERSION='2.0' |
237 |
|
238 |
source "gnap_shared.sh" |
239 |
-echo "GNAP remastering tool ${GNAPNAME} ${VERSION}" |
240 |
+echo "GNAP remastering tool ${GNAP_NAME} ${VERSION}" |
241 |
|
242 |
OUTPUT='mygnap-core.tar' |
243 |
|
244 |
usage() { |
245 |
echo |
246 |
echo 'Usage:' |
247 |
- echo " ${GNAPNAME} [ options ]" |
248 |
+ echo " ${GNAP_NAME} [ options ]" |
249 |
echo |
250 |
echo 'Options:' |
251 |
echo ' -e extension Extension to include in core file' |
252 |
@@ -22,7 +22,7 @@ |
253 |
echo ' -f Force all answers to yes (dangerous !)' |
254 |
echo ' -T gnap_tempdir Use given temp dir' |
255 |
echo |
256 |
- echo "Please man ${GNAPNAME} for more details." |
257 |
+ echo "Use man ${GNAP_NAME} for more details." |
258 |
} |
259 |
|
260 |
if [[ "$#" -eq 0 || "${1}" == '-h' ]]; then |
261 |
@@ -41,25 +41,25 @@ |
262 |
k ) KERNEXT="${OPTARG}";; |
263 |
m ) MODEXT="${OPTARG}";; |
264 |
o ) OUTPUT="${OPTARG}";; |
265 |
- g ) GNAPCORE="${OPTARG}";; |
266 |
- b ) GNAPBASEFS="${OPTARG}";; |
267 |
- d ) GNAPEXTDIR="${OPTARG}";; |
268 |
+ g ) GNAP_CORE="${OPTARG}";; |
269 |
+ b ) GNAP_BASEFS="${OPTARG}";; |
270 |
+ d ) GNAP_EXTDIR="${OPTARG}";; |
271 |
f ) FORCEYES=1;; |
272 |
- T ) TEMPDIR="${OPTARG}";; |
273 |
+ T ) GNAP_TEMPDIR="${OPTARG}";; |
274 |
* ) gtest 1 'Specified options are incomplete or unknown !';; |
275 |
esac |
276 |
done |
277 |
|
278 |
# Root is needed |
279 |
test "${EUID}" -eq 0 |
280 |
-gtest continued $? "You need to be root to run ${GNAPNAME}" |
281 |
+gtest continued $? "You need to be root to run ${GNAP_NAME}" |
282 |
|
283 |
# basefs file is required |
284 |
-test -f "${GNAPBASEFS}" |
285 |
+test -f "${GNAP_BASEFS}" |
286 |
gtest continued $? 'Please specify a valid GNAP basefs file (-b option)' |
287 |
|
288 |
# core file is required |
289 |
-test -f "${GNAPCORE}" |
290 |
+test -f "${GNAP_CORE}" |
291 |
gtest continued $? 'Please specify a valid GNAP core file (-g option)' |
292 |
|
293 |
# At least one operation is required |
294 |
@@ -75,34 +75,34 @@ |
295 |
make_tempdir |
296 |
|
297 |
# Preparing new FS |
298 |
-gbegin "Unpacking ${GNAPBASEFS} basefs" |
299 |
-TEMPOVERDIR="${TEMPDIR}/basefs" |
300 |
+gbegin "Unpacking ${GNAP_BASEFS} basefs" |
301 |
+TEMPOVERDIR="${GNAP_TEMPDIR}/basefs" |
302 |
mkdir "${TEMPOVERDIR}" |
303 |
gtest continued $? 'Failed to create basefs temporary subdirectory' |
304 |
|
305 |
-tar jx -C "${TEMPOVERDIR}" -f "${GNAPBASEFS}" |
306 |
+tar jx -C "${TEMPOVERDIR}" -f "${GNAP_BASEFS}" |
307 |
gtest $? 'Failed to unpack basefs' |
308 |
|
309 |
for overlay in ${EXTENSIONS} ; do |
310 |
gbegin "Adding ${overlay} extension" |
311 |
- test -f "${GNAPEXTDIR}/gnapext_${overlay}.tbz2" |
312 |
- gtest continued $? "${GNAPEXTDIR}/gnapext_${overlay}.tbz2 does not exist" |
313 |
- tar jxf "${GNAPEXTDIR}/gnapext_${overlay}.tbz2" -C "${TEMPOVERDIR}" |
314 |
+ test -f "${GNAP_EXTDIR}/gnapext_${overlay}.tbz2" |
315 |
+ gtest continued $? "${GNAP_EXTDIR}/gnapext_${overlay}.tbz2 does not exist" |
316 |
+ tar jxf "${GNAP_EXTDIR}/gnapext_${overlay}.tbz2" -C "${TEMPOVERDIR}" |
317 |
gtest $? "${overlay} is not a valid extension (tbz2 format)" |
318 |
done |
319 |
|
320 |
# Preparing new core |
321 |
gbegin 'Extracting core tarball' |
322 |
-TEMPCOREDIR="${TEMPDIR}/core" |
323 |
+TEMPCOREDIR="${GNAP_TEMPDIR}/core" |
324 |
mkdir "${TEMPCOREDIR}" |
325 |
gtest continued $? 'Failed to create core temporary subdirectory' |
326 |
|
327 |
-tar x -C "${TEMPCOREDIR}" -f "${GNAPCORE}" --exclude image.squashfs |
328 |
+tar x -C "${TEMPCOREDIR}" -f "${GNAP_CORE}" --exclude image.squashfs |
329 |
gtest $? 'Failed to extract core' |
330 |
|
331 |
if [[ -f "${KERNEXT}" ]]; then |
332 |
gbegin "Replacing kernel and initrd using ${KERNEXT}" |
333 |
- TEMPKERNDIR="${TEMPDIR}/kernel" |
334 |
+ TEMPKERNDIR="${GNAP_TEMPDIR}/kernel" |
335 |
mkdir "${TEMPKERNDIR}" |
336 |
gtest continued $? 'Failed to create kernel temporary subdirectory' |
337 |
|
338 |
@@ -136,6 +136,6 @@ |
339 |
|
340 |
# Successful finish |
341 |
cleanup |
342 |
-echo 'Remaster successful !' |
343 |
+echo "${GNAP_PRODUCT} successful !" |
344 |
exit 0 |
345 |
|
346 |
Index: src/gnap_make |
347 |
=================================================================== |
348 |
--- src/gnap_make (revision 73) |
349 |
+++ src/gnap_make (working copy) |
350 |
@@ -17,7 +17,7 @@ |
351 |
echo ' -e specs Specs directory or tar.bz2 file' |
352 |
echo ' -T gnap_tempdir Use given temp dir' |
353 |
echo |
354 |
- echo "Please man ${GNAPNAME} for more details." |
355 |
+ echo "Use man ${GNAP_NAME} for more details." |
356 |
} |
357 |
|
358 |
if [[ "$#" -eq 0 || "${1}" == '-h' ]]; then |
359 |
@@ -34,8 +34,8 @@ |
360 |
case ${options} in |
361 |
h ) usage |
362 |
exit 0;; |
363 |
- s ) STAGE3FILE="${OPTARG}";; |
364 |
- p ) SNAPSHOTFILE="${OPTARG}";; |
365 |
+ s ) GNAP_STAGE3FILE="${OPTARG}";; |
366 |
+ p ) GNAP_SNAPSHOTFILE="${OPTARG}";; |
367 |
o ) PORTAGE_OVERLAYS="${PORTAGE_OVERLAYS} ${OPTARG}";; |
368 |
v ) STAMP="${OPTARG}";; |
369 |
t ) |
370 |
@@ -59,31 +59,31 @@ |
371 |
f ) FORCEYES=1;; |
372 |
l ) GNAPLOGPREFIX="${OPTARG}";; |
373 |
c ) CATALYST_CONF="${OPTARG}";; |
374 |
- e ) SPECS="${OPTARG}";; |
375 |
- T ) TEMPDIR="${OPTARG}";; |
376 |
+ e ) GNAP_SPECS="${OPTARG}";; |
377 |
+ T ) GNAP_TEMPDIR="${OPTARG}";; |
378 |
* ) gtest 1 'Specified options are incomplete or unknown !';; |
379 |
esac |
380 |
done |
381 |
|
382 |
# Root is needed |
383 |
test "${EUID}" -eq 0 |
384 |
-gtest continued $? "You need to be root to run ${GNAPNAME}" |
385 |
+gtest continued $? "You need to be root to run ${GNAP_NAME}" |
386 |
|
387 |
# Setting up temporary directory |
388 |
make_tempdir |
389 |
|
390 |
# Prepare specs dir and check common.conf file |
391 |
-SPECDIR="${TEMPDIR}/specs" |
392 |
-if [[ -f "${SPECS}" ]]; then |
393 |
+SPECDIR="${GNAP_TEMPDIR}/specs" |
394 |
+if [[ -f "${GNAP_SPECS}" ]]; then |
395 |
mkdir "${SPECDIR}" |
396 |
gtest continued $? 'Failed to create specs temporary subdirectory' |
397 |
- tar jx -f "${SPECS}" -C "${SPECDIR}" |
398 |
+ tar jx -f "${GNAP_SPECS}" -C "${SPECDIR}" |
399 |
gtest continued $? 'Failed to unpack specs' |
400 |
-elif [[ -d "${SPECS}" ]]; then |
401 |
- cp -rp "${SPECS}" "${SPECDIR}" |
402 |
+elif [[ -d "${GNAP_SPECS}" ]]; then |
403 |
+ cp -rp "${GNAP_SPECS}" "${SPECDIR}" |
404 |
gtest continued $? 'Failed to copy specs directory contents' |
405 |
else |
406 |
- gtest continued 1 "${SPECS} not found, provide a valid -e option" |
407 |
+ gtest continued 1 "${GNAP_SPECS} not found, provide a valid -e option" |
408 |
fi |
409 |
test -f "${SPECDIR}/common.conf" |
410 |
gtest continued $? "Incorrect specdir: ${SPECDIR}/common.conf not found !" |
411 |
@@ -124,20 +124,20 @@ |
412 |
|
413 |
# Stage3 needs a seed stage |
414 |
if [[ "${STAGE3}" -eq 1 ]]; then |
415 |
- test -f "${STAGE3FILE}" |
416 |
+ test -f "${GNAP_STAGE3FILE}" |
417 |
gtest continued $? 'The "-s" option needs to designate a valid seed stage' |
418 |
fi |
419 |
|
420 |
# Snapshot must exist if a stage is selected |
421 |
if [[ "${NEEDS_SNAPSHOT}" -eq 1 ]]; then |
422 |
- test -f "${SNAPSHOTFILE}" |
423 |
- gtest continued $? "Can't find ${SNAPSHOTFILE}" |
424 |
+ test -f "${GNAP_SNAPSHOTFILE}" |
425 |
+ gtest continued $? "Can't find ${GNAP_SNAPSHOTFILE}" |
426 |
fi |
427 |
|
428 |
# Seed stage if needed must be an existing file |
429 |
if [[ "${STAGE3}" -eq 1 ]]; then |
430 |
- test -f "${STAGE3FILE}" |
431 |
- gtest continued $? "${STAGE3FILE} is not a valid stage3 tarball" |
432 |
+ test -f "${GNAP_STAGE3FILE}" |
433 |
+ gtest continued $? "${GNAP_STAGE3FILE} is not a valid stage3 tarball" |
434 |
fi |
435 |
gtest 0 |
436 |
|
437 |
@@ -150,7 +150,7 @@ |
438 |
if [[ ! -d "${CATALYST_DIR}/builds/${RELTYPE}" ]]; then |
439 |
mkdir -p "${CATALYST_DIR}/builds/${RELTYPE}" |
440 |
fi |
441 |
- cp "${STAGE3FILE}" "${STAGE3LOC}" |
442 |
+ cp "${GNAP_STAGE3FILE}" "${STAGE3LOC}" |
443 |
fi |
444 |
fi |
445 |
|
446 |
@@ -182,7 +182,7 @@ |
447 |
|
448 |
# Logfile setup and confirmation |
449 |
if [[ -z "$GNAPLOGPREFIX" ]]; then |
450 |
- GNAPLOGPREFIX="./${GNAPNAME}-${STAMP}" |
451 |
+ GNAPLOGPREFIX="./${GNAP_NAME}-${STAMP}" |
452 |
fi |
453 |
|
454 |
if [[ -f "${GNAPLOGPREFIX}.out" || -f "${GNAPLOGPREFIX}.err" ]]; then |
455 |
@@ -208,14 +208,14 @@ |
456 |
fi |
457 |
|
458 |
if [[ -z "${PORTAGE_OVERLAYS}" ]]; then |
459 |
- cp "${SNAPSHOTFILE}" "${CATALYST_DIR}/snapshots/portage-${STAMP}.tar.bz2" |
460 |
+ cp "${GNAP_SNAPSHOTFILE}" |
461 |
"${CATALYST_DIR}/snapshots/portage-${STAMP}.tar.bz2" |
462 |
gtest $? "Snapshot preparation failed, ${SEELOGFILES}" |
463 |
else |
464 |
- TEMPPRTDIR="${TEMPDIR}/portage" |
465 |
+ TEMPPRTDIR="${GNAP_TEMPDIR}/portage" |
466 |
mkdir "${TEMPPRTDIR}" |
467 |
gtest continued $? 'Failed to create portage temporary subdirectory' |
468 |
|
469 |
- tar jxf "${SNAPSHOTFILE}" -C "${TEMPPRTDIR}" \ |
470 |
+ tar jxf "${GNAP_SNAPSHOTFILE}" -C "${TEMPPRTDIR}" \ |
471 |
>> "${GNAPLOGPREFIX}.out" 2>> "${GNAPLOGPREFIX}.err" |
472 |
|
473 |
for overlay in ${PORTAGE_OVERLAYS} ; do |
474 |
@@ -237,9 +237,9 @@ |
475 |
if [[ ! -d "${CATALYST_DIR}/builds/${RELTYPE}" ]]; then |
476 |
mkdir -p "${CATALYST_DIR}/builds/${RELTYPE}" |
477 |
fi |
478 |
- cp "${STAGE3FILE}" "${CATALYST_DIR}/builds/${RELTYPE}/seedstage.tar.bz2" |
479 |
+ cp "${GNAP_STAGE3FILE}" |
480 |
"${CATALYST_DIR}/builds/${RELTYPE}/seedstage.tar.bz2" |
481 |
|
482 |
- TEMPCONF="${TEMPDIR}/stage3.conf" |
483 |
+ TEMPCONF="${GNAP_TEMPDIR}/stage3.conf" |
484 |
touch "${TEMPCONF}" |
485 |
gtest continued $? 'Failed to create stage3 temporary conf file' |
486 |
cat >> "${TEMPCONF}" <<EOF |
487 |
@@ -262,7 +262,7 @@ |
488 |
# LIVECD-STAGE1 phase |
489 |
if [[ "${LIVECD1}" -eq 1 ]]; then |
490 |
gbegin "${G}[livecd-stage1]${N} stage (GNAP-specific packages build)" |
491 |
- TEMPCONF="${TEMPDIR}/livecd-stage1.conf" |
492 |
+ TEMPCONF="${GNAP_TEMPDIR}/livecd-stage1.conf" |
493 |
touch "${TEMPCONF}" |
494 |
gtest continued $? 'Failed to create livecd-stage1 temporary conf file' |
495 |
cat >> "${TEMPCONF}" <<EOF |
496 |
@@ -286,7 +286,7 @@ |
497 |
# LIVECD-STAGE2 phase |
498 |
if [[ "${LIVECD2}" -eq 1 ]]; then |
499 |
gbegin "${G}[livecd-stage2]${N} stage (kernel and LiveCD builds)" |
500 |
- TEMPCONF="${TEMPDIR}/livecd-stage2.conf" |
501 |
+ TEMPCONF="${GNAP_TEMPDIR}/livecd-stage2.conf" |
502 |
touch "${TEMPCONF}" |
503 |
gtest continued $? 'Failed to create livecd-stage2 temporary conf file' |
504 |
cat >> "${TEMPCONF}" <<EOF |
505 |
@@ -321,10 +321,10 @@ |
506 |
gtest $? 'Missing livecd-stage2 results' |
507 |
|
508 |
gbegin ' Creating core component' |
509 |
- TEMPMNTDIR="${TEMPDIR}/mount" |
510 |
+ TEMPMNTDIR="${GNAP_TEMPDIR}/mount" |
511 |
mkdir "${TEMPMNTDIR}" |
512 |
gtest continued $? 'Failed to create mount temporary subdirectory' |
513 |
- TEMPISODIR="${TEMPDIR}/iso" |
514 |
+ TEMPISODIR="${GNAP_TEMPDIR}/iso" |
515 |
mkdir "${TEMPISODIR}" |
516 |
gtest continued $? 'Failed to create iso temporary subdirectory' |
517 |
|
518 |
@@ -368,7 +368,7 @@ |
519 |
mod_packlist="${mod_packlist/${mod_name}\/packlist:/}" |
520 |
mod_cleanup=$(grep "^${mod_name}/cleanup:" ${SPECMODULE} 2>/dev/null); |
521 |
mod_cleanup="${mod_cleanup/${mod_name}\/cleanup:/}" |
522 |
- TEMPCONF="${TEMPDIR}/ext-${mod_name}.conf" |
523 |
+ TEMPCONF="${GNAP_TEMPDIR}/ext-${mod_name}.conf" |
524 |
touch "${TEMPCONF}" |
525 |
gtest continued $? 'Failed to create extension temporary conf file' |
526 |
cat >> $TEMPCONF <<EOF |
527 |
@@ -391,7 +391,7 @@ |
528 |
gtest continued $? \ |
529 |
"Extension build failed, ${SEELOGFILES}" |
530 |
|
531 |
- TEMPMODULEDIR="${TEMPDIR}/module_${mod_name}" |
532 |
+ TEMPMODULEDIR="${GNAP_TEMPDIR}/module_${mod_name}" |
533 |
mkdir "${TEMPMODULEDIR}" |
534 |
gtest continued $? 'Failed to create module temporary subdirectory' |
535 |
for pkg in $( ls ${GRP_PREFIX}/${mod_name}/All/*.tbz2 ); do |
536 |
@@ -416,5 +416,5 @@ |
537 |
fi |
538 |
|
539 |
cleanup |
540 |
-echo 'Build successful !' |
541 |
+echo "${GNAP_PRODUCT} successful !" |
542 |
exit 0 |
543 |
Index: src/gnap_shared.sh |
544 |
=================================================================== |
545 |
--- src/gnap_shared.sh (revision 73) |
546 |
+++ src/gnap_shared.sh (working copy) |
547 |
@@ -1,23 +1,24 @@ |
548 |
-GNAPNAME=$(basename "$0") |
549 |
+GNAP_NAME=$(basename "$0") |
550 |
|
551 |
-case ${GNAPNAME} in |
552 |
- gnap_make ) GNAPPRODUCT="Build";; |
553 |
- gnap_overlay ) GNAPPRODUCT="Overlay";; |
554 |
- gnap_remaster ) GNAPPRODUCT="Remaster";; |
555 |
- * ) GNAPPRODUCT="Something";; |
556 |
+case ${GNAP_NAME} in |
557 |
+ gnap_make ) GNAP_PRODUCT="Build";; |
558 |
+ gnap_overlay ) GNAP_PRODUCT="Overlay";; |
559 |
+ gnap_remaster ) GNAP_PRODUCT="Remaster";; |
560 |
+ * ) GNAP_PRODUCT="Something";; |
561 |
esac |
562 |
|
563 |
-GNAPLIBDIR='/usr/lib/gnap' |
564 |
-STAGE3FILE="${GNAPLIBDIR}/gnap-stage3seed.tar.bz2" |
565 |
-SNAPSHOTFILE="${GNAPLIBDIR}/gnap-portagesnapshot.tar.bz2" |
566 |
-SPECS="${GNAPLIBDIR}/gnap-specs.tar.bz2" |
567 |
-GNAPCORE="${GNAPLIBDIR}/gnap-core.tar" |
568 |
-GNAPMBR="${GNAPLIBDIR}/mbr/mbr.bin" |
569 |
-GNAPEXTDIR="${GNAPLIBDIR}/extensions" |
570 |
-GNAPBASEFS="${GNAPLIBDIR}/gnap-basefs.tar.bz2" |
571 |
+GNAP_LIBDIR='/usr/lib/gnap' |
572 |
+GNAP_STAGE3FILE="${GNAP_LIBDIR}/gnap-stage3seed.tar.bz2" |
573 |
+GNAP_SNAPSHOTFILE="${GNAP_LIBDIR}/gnap-portagesnapshot.tar.bz2" |
574 |
+GNAP_SPECS="${GNAP_LIBDIR}/gnap-specs.tar.bz2" |
575 |
+GNAP_CORE="${GNAP_LIBDIR}/gnap-core.tar" |
576 |
+GNAP_MBR="${GNAP_LIBDIR}/mbr/mbr.bin" |
577 |
+GNAP_EXTDIR="${GNAP_LIBDIR}/extensions" |
578 |
+GNAP_BASEFS="${GNAP_LIBDIR}/gnap-basefs.tar.bz2" |
579 |
+GNAP_TEMPDIR='' |
580 |
|
581 |
-TEMPDIR='' |
582 |
LOOP='' |
583 |
+FORCEYES=0 |
584 |
|
585 |
G=$'\e[32;01m' |
586 |
B=$'\e[31;01m' |
587 |
@@ -37,10 +38,10 @@ |
588 |
else |
589 |
read -ep " ${W}*${N} ${*} [N]: " answer |
590 |
if [[ "${answer}" != 'y' && "${answer}" != 'Y' ]]; then |
591 |
- if [[ -n "${TEMPDIR}" ]]; then |
592 |
+ if [[ -n "${GNAP_TEMPDIR}" ]]; then |
593 |
cleanup |
594 |
fi |
595 |
- echo "${GNAPPRODUCT} aborted !" |
596 |
+ echo "${GNAP_PRODUCT} aborted !" |
597 |
exit 2 |
598 |
fi |
599 |
fi |
600 |
@@ -67,10 +68,10 @@ |
601 |
echo -en " ${B}*${N} ${*}" |
602 |
echo -e "${E} ${K}[ ${B}!!${K} ]${N}" |
603 |
fi |
604 |
- if [[ -n "${TEMPDIR}" ]]; then |
605 |
+ if [[ -n "${GNAP_TEMPDIR}" ]]; then |
606 |
cleanup |
607 |
fi |
608 |
- echo "${GNAPPRODUCT} failed, try ${GNAPNAME} -h for more help" |
609 |
+ echo "${GNAP_PRODUCT} failed, try ${GNAP_NAME} -h for help" |
610 |
exit 1 |
611 |
fi |
612 |
} |
613 |
@@ -82,9 +83,9 @@ |
614 |
gtest $? "Failed to unmount ${LOOP}" |
615 |
fi |
616 |
gbegin 'Cleaning temporary directories' |
617 |
- if [[ -d "${TEMPDIR}" ]]; then |
618 |
- DIRTOREMOVE="${TEMPDIR}" |
619 |
- TEMPDIR='' |
620 |
+ if [[ -d "${GNAP_TEMPDIR}" ]]; then |
621 |
+ DIRTOREMOVE="${GNAP_TEMPDIR}" |
622 |
+ GNAP_TEMPDIR='' |
623 |
rm -rf "${DIRTOREMOVE}" |
624 |
gtest $? "Failed to remove ${DIRTOREMOVE}" |
625 |
else |
626 |
@@ -93,13 +94,13 @@ |
627 |
} |
628 |
|
629 |
make_tempdir() { |
630 |
- if [[ "${TEMPDIR}" = "" ]]; then |
631 |
- TEMPDIR=$(mktemp -d -t gnap_make.XXXXXX) |
632 |
+ if [[ "${GNAP_TEMPDIR}" = "" ]]; then |
633 |
+ GNAP_TEMPDIR=$(mktemp -d -t gnap_make.XXXXXX) |
634 |
gtest continued $? 'Failed to create temporary directory' |
635 |
- elif [[ -d "${TEMPDIR}" ]] |
636 |
- gconfirm "${TEMPDIR} already exists. Continue?" |
637 |
+ elif [[ -d "${GNAP_TEMPDIR}" ]] |
638 |
+ gconfirm "${GNAP_TEMPDIR} already exists. Continue?" |
639 |
else |
640 |
- mkdir -p "${TEMPDIR}" |
641 |
- gtest continued $? "Failed to create ${TEMPDIR}" |
642 |
+ mkdir -p "${GNAP_TEMPDIR}" |
643 |
+ gtest continued $? "Failed to create ${GNAP_TEMPDIR}" |
644 |
fi |
645 |
} |
646 |
|
647 |
-- |
648 |
gnap-dev@g.o mailing list |