1 |
This patch clears up the gnap namespace: |
2 |
|
3 |
I use the GNAP_ prefix for all variables that are directly configurable |
4 |
by the user, names without GNAP_ are either internally used or not |
5 |
changeable by the user. |
6 |
|
7 |
Some of the GNAP_* vars are not changeable by the user in this patch but |
8 |
will be in the next one. |
9 |
|
10 |
The variables from common.conf are not changed to GNAP_ since i thought |
11 |
they were special and i did not make the names longer. But this could be |
12 |
changed of course. |
13 |
|
14 |
Philipp |
15 |
|
16 |
|
17 |
diff -ur --exclude .svn --exclude upload.sh --exclude diff.sh gnap-2.0 |
18 |
+cleanup+split/src/gnap_make gnap-2.0+cleanup+split |
19 |
+namespace/src/gnap_make |
20 |
--- gnap-2.0+cleanup+split/src/gnap_make 2007-08-02 15:54:29.000000000 |
21 |
+0300 |
22 |
+++ gnap-2.0+cleanup+split+namespace/src/gnap_make 2007-08-02 |
23 |
15:50:45.000000000 +0300 |
24 |
@@ -1,9 +1,9 @@ |
25 |
#!/bin/bash |
26 |
-GNAPVERSION='2.0' |
27 |
+VERSION='2.0' |
28 |
|
29 |
-GNAPLIBDIR='/usr/lib/gnap' |
30 |
-source ${GNAPLIBDIR}/gnap_shared.sh |
31 |
-echo "GNAP Core Building tool ${GNAPNAME} version ${GNAPVERSION}" |
32 |
+GNAP_LIBDIR='/usr/lib/gnap' |
33 |
+source ${GNAP_LIBDIR}/gnap_shared.sh |
34 |
+echo "GNAP Core Building tool ${NAME} version ${VERSION}" |
35 |
|
36 |
usage() { |
37 |
echo 'Options:' |
38 |
@@ -17,7 +17,7 @@ |
39 |
echo ' -c catalyst.conf Use specific catalyst.conf file' |
40 |
echo ' -e specs Specs directory or tar.bz2 file' |
41 |
echo |
42 |
- echo "Please use man ${GNAPNAME} for more details." |
43 |
+ echo "Please use man ${NAME} for more details." |
44 |
} |
45 |
|
46 |
if [[ "$#" -eq 0 ]]; then |
47 |
@@ -28,58 +28,64 @@ |
48 |
gbegin 'Checking parameters' |
49 |
|
50 |
# Catalyst executable and config file |
51 |
-CATALYST_BIN="/usr/bin/catalyst" |
52 |
-CATALYST_CONF="/etc/catalyst/catalyst.conf" |
53 |
+GNAP_CATALYST_BIN="/usr/bin/catalyst" |
54 |
+GNAP_CATALYST_CONF="/etc/catalyst/catalyst.conf" |
55 |
|
56 |
# Read options |
57 |
+GNAP_STAGE3=0 |
58 |
+GNAP_LIVECD1=0 |
59 |
+GNAP_LIVECD2=0 |
60 |
+GNAP_TARBALL=0 |
61 |
+GNAP_MODULES=0 |
62 |
+GNAP_STAMP=$(date +%Y%m%d) |
63 |
NOTARGET=1 |
64 |
-STAMP=$(date +%Y%m%d) |
65 |
+NEEDS_SNAPSHOT=0 |
66 |
while getopts ':hs:p:m:o:v:t:fl:c:e:' option; do |
67 |
case ${option} in |
68 |
h ) |
69 |
usage |
70 |
exit 0;; |
71 |
- s ) STAGE3FILE="${OPTARG}";; |
72 |
- p ) SNAPSHOTFILE="${OPTARG}";; |
73 |
- o ) PORTAGE_OVERLAYS="${PORTAGE_OVERLAYS} ${OPTARG}";; |
74 |
- v ) STAMP="${OPTARG}";; |
75 |
+ s ) GNAP_STAGE3FILE="${OPTARG}";; |
76 |
+ p ) GNAP_SNAPSHOTFILE="${OPTARG}";; |
77 |
+ o ) GNAP_PORTAGE_OVERLAYS="${GNAP_PORTAGE_OVERLAYS} ${OPTARG}";; |
78 |
+ v ) GNAP_STAMP="${OPTARG}";; |
79 |
t ) |
80 |
case "${OPTARG}" in |
81 |
all ) |
82 |
- STAGE3=1 |
83 |
- LIVECD1=1 |
84 |
- LIVECD2=1 |
85 |
- TARBALL=1 |
86 |
- MODULES=1 |
87 |
+ GNAP_STAGE3=1 |
88 |
+ GNAP_LIVECD1=1 |
89 |
+ GNAP_LIVECD2=1 |
90 |
+ GNAP_TARBALL=1 |
91 |
+ GNAP_MODULES=1 |
92 |
NEEDS_SNAPSHOT=1;; |
93 |
stage3 ) |
94 |
- STAGE3=1 |
95 |
+ GNAP_STAGE3=1 |
96 |
NEEDS_SNAPSHOT=1;; |
97 |
livecd-stage1 ) |
98 |
- LIVECD1=1 |
99 |
+ GNAP_LIVECD1=1 |
100 |
NEEDS_SNAPSHOT=1;; |
101 |
livecd-stage2 ) |
102 |
- LIVECD2=1 |
103 |
+ GNAP_LIVECD2=1 |
104 |
NEEDS_SNAPSHOT=1;; |
105 |
tarball ) |
106 |
- TARBALL=1;; |
107 |
+ GNAP_TARBALL=1;; |
108 |
extensions ) |
109 |
- MODULES=1 |
110 |
+ GNAP_MODULES=1 |
111 |
NEEDS_SNAPSHOT=1;; |
112 |
* ) gtest 1 'Specified stage is unknown!';; |
113 |
esac |
114 |
NOTARGET=0;; |
115 |
- f ) FORCEYES=1;; |
116 |
- l ) GNAPLOGPREFIX="${OPTARG}";; |
117 |
- c ) CATALYST_CONF="${OPTARG}";; |
118 |
- e ) SPECS="${OPTARG}";; |
119 |
+ f ) GNAP_FORCEYES=1;; |
120 |
+ l ) GNAP_LOGPREFIX="${OPTARG}";; |
121 |
+ c ) GNAP_CATALYST_CONF="${OPTARG}";; |
122 |
+ e ) GNAP_SPECS="${OPTARG}";; |
123 |
* ) gtest 1 'Specified options are incomplete or unknown!';; |
124 |
esac |
125 |
done |
126 |
|
127 |
# Root is needed |
128 |
test "${EUID}" -eq 0 |
129 |
-gtest continued $? "You need to be root to run ${GNAPNAME}" |
130 |
+gtest continued $? "You need to be root to run ${NAME}" |
131 |
|
132 |
# Setting up temporary directory |
133 |
TEMPDIR=$(mktemp -d -t gnap_make.XXXXXX) |
134 |
@@ -87,15 +93,15 @@ |
135 |
|
136 |
# Prepare specs dir and check common.conf file |
137 |
SPECDIR="${TEMPDIR}/specs" |
138 |
-if [[ -f "${SPECS}" ]]; then |
139 |
+if [[ -f "${GNAP_SPECS}" ]]; then |
140 |
gmkdir "${SPECDIR}" |
141 |
- tar jx -f "${SPECS}" -C "${SPECDIR}" |
142 |
+ tar jx -f "${GNAP_SPECS}" -C "${SPECDIR}" |
143 |
gtest continued $? 'Failed to unpack specs' |
144 |
-elif [[ -d "${SPECS}" ]]; then |
145 |
- cp -rp "${SPECS}" "${SPECDIR}" |
146 |
+elif [[ -d "${GNAP_SPECS}" ]]; then |
147 |
+ cp -rp "${GNAP_SPECS}" "${SPECDIR}" |
148 |
gtest continued $? 'Failed to copy specs directory contents' |
149 |
else |
150 |
- gtest continued 1 "${SPECS} not found, provide a valid -e option" |
151 |
+ gtest continued 1 "${GNAP_SPECS} not found, provide a valid -e option" |
152 |
fi |
153 |
test -f "${SPECDIR}/common.conf" |
154 |
gtest continued $? "Incorrect specdir: ${SPECDIR}/common.conf not |
155 |
found!" |
156 |
@@ -108,9 +114,9 @@ |
157 |
fi |
158 |
|
159 |
# catalyst.conf file |
160 |
-test -f "${CATALYST_CONF}" |
161 |
-gtest continued $? "${CATALYST_CONF} file not found!" |
162 |
-source "${CATALYST_CONF}" |
163 |
+test -f "${GNAP_CATALYST_CONF}" |
164 |
+gtest continued $? "${GNAP_CATALYST_CONF} file not found!" |
165 |
+source "${GNAP_CATALYST_CONF}" |
166 |
|
167 |
# At least one target is needed |
168 |
test "${NOTARGET}" -eq 0 |
169 |
@@ -121,76 +127,76 @@ |
170 |
gmkdir "${storedir}" |
171 |
|
172 |
# Stage3 needs a seed stage |
173 |
-if [[ "${STAGE3}" -eq 1 ]]; then |
174 |
- test -f "${STAGE3FILE}" |
175 |
+if [[ "${GNAP_STAGE3}" -eq 1 ]]; then |
176 |
+ test -f "${GNAP_STAGE3FILE}" |
177 |
gtest continued $? 'The "-s" option needs to designate a valid seed |
178 |
stage' |
179 |
fi |
180 |
|
181 |
# Snapshot must exist if a stage is selected |
182 |
if [[ "${NEEDS_SNAPSHOT}" -eq 1 ]]; then |
183 |
- test -f "${SNAPSHOTFILE}" |
184 |
- gtest continued $? "Can't find ${SNAPSHOTFILE}" |
185 |
+ test -f "${GNAP_SNAPSHOTFILE}" |
186 |
+ gtest continued $? "Can't find ${GNAP_SNAPSHOTFILE}" |
187 |
fi |
188 |
|
189 |
# Seed stage if needed must be an existing file |
190 |
-if [[ "${STAGE3}" -eq 1 ]]; then |
191 |
- test -f "${STAGE3FILE}" |
192 |
- gtest continued $? "${STAGE3FILE} is not a valid stage3 tarball" |
193 |
+if [[ "${GNAP_STAGE3}" -eq 1 ]]; then |
194 |
+ test -f "${GNAP_STAGE3FILE}" |
195 |
+ gtest continued $? "${GNAP_STAGE3FILE} is not a valid stage3 tarball" |
196 |
fi |
197 |
|
198 |
# If extensions and no stage3, warn that we'll use seedstage as stage3 |
199 |
-STAGE3LOC="${storedir}/builds/${RELTYPE}/stage3-${SUBARCH}-${STAMP}.tar.bz2" |
200 |
-if [[ "${MODULES}" -eq 1 || "${LIVECD1}" -eq 1 ]]; then |
201 |
- if [[ "${STAGE3}" -ne 1 && ! -f "${STAGE3LOC}" ]]; then |
202 |
+STAGE3LOC="${storedir}/builds/${RELTYPE}/stage3-${SUBARCH}-${GNAP_STAMP}.tar.bz2" |
203 |
+if [[ "${GNAP_MODULES}" -eq 1 || "${GNAP_LIVECD1}" -eq 1 ]]; then |
204 |
+ if [[ "${GNAP_STAGE3}" -ne 1 && ! -f "${STAGE3LOC}" ]]; then |
205 |
gwarn '"livecd-stage1" or "extensions" was selected without |
206 |
"stage3".' |
207 |
gconfirm 'Should I use the seed stage as stage3 result?' |
208 |
gmkdir "${storedir}/builds/${RELTYPE}" |
209 |
- cp "${STAGE3FILE}" "${STAGE3LOC}" |
210 |
+ cp "${GNAP_STAGE3FILE}" "${STAGE3LOC}" |
211 |
fi |
212 |
fi |
213 |
|
214 |
# Explain what will get built |
215 |
-if [[ "${STAGE3}" -eq 1 ]]; then |
216 |
+if [[ "${GNAP_STAGE3}" -eq 1 ]]; then |
217 |
TARGETLIST='[stage3] ' |
218 |
fi |
219 |
-if [[ "${LIVECD1}" -eq 1 ]]; then |
220 |
+if [[ "${GNAP_LIVECD1}" -eq 1 ]]; then |
221 |
TARGETLIST="${TARGETLIST}[livecd-stage1] " |
222 |
fi |
223 |
-if [[ "${LIVECD2}" -eq 1 ]]; then |
224 |
+if [[ "${GNAP_LIVECD2}" -eq 1 ]]; then |
225 |
TARGETLIST="${TARGETLIST}[livecd-stage2] " |
226 |
fi |
227 |
-if [[ "${TARBALL}" -eq 1 ]]; then |
228 |
+if [[ "${GNAP_TARBALL}" -eq 1 ]]; then |
229 |
TARGETLIST="${TARGETLIST}[tarball] " |
230 |
fi |
231 |
-if [[ "${MODULES}" -eq 1 ]]; then |
232 |
+if [[ "${GNAP_MODULES}" -eq 1 ]]; then |
233 |
TARGETLIST="${TARGETLIST}[extensions]" |
234 |
fi |
235 |
ginfo 'The following targets will be called:' |
236 |
ginfo "${TARGETLIST}" |
237 |
|
238 |
# Confirm tarball overwrite if TARBALL stage selected |
239 |
-if [[ "${TARBALL}" -eq 1 && -e "gnap-${GNAPVERSION}-${STAMP}.tar" ]]; |
240 |
then |
241 |
- gconfirm "gnap-${GNAPVERSION}-${STAMP}.tar already exists, overwrite" |
242 |
+if [[ "${GNAP_TARBALL}" -eq 1 && -e |
243 |
"gnap-${VERSION}-${GNAP_STAMP}.tar" ]]; then |
244 |
+ gconfirm "gnap-${VERSION}-${GNAP_STAMP}.tar already exists, overwrite" |
245 |
fi |
246 |
|
247 |
# Logfile setup and confirmation |
248 |
-if [[ -z "$GNAPLOGPREFIX" ]]; then |
249 |
- GNAPLOGPREFIX="./${GNAPNAME}-${STAMP}" |
250 |
+if [[ -z "$GNAP_LOGPREFIX" ]]; then |
251 |
+ GNAP_LOGPREFIX="./${NAME}-${GNAP_STAMP}" |
252 |
fi |
253 |
|
254 |
-if [[ -f "${GNAPLOGPREFIX}.out" || -f "${GNAPLOGPREFIX}.err" ]]; then |
255 |
- if [[ "${FORCEYES}" -ne 1 ]]; then |
256 |
+if [[ -f "${GNAP_LOGPREFIX}.out" || -f "${GNAP_LOGPREFIX}.err" ]]; then |
257 |
+ if [[ "${GNAP_FORCEYES}" -ne 1 ]]; then |
258 |
read -ep \ |
259 |
" ${W}*${N} Logfile(s) already exists. Append/Overwrite [A]: " \ |
260 |
answer |
261 |
if [[ "${answer}" == 'o' || "${answer}" == 'O' ]]; then |
262 |
- rm "${GNAPLOGPREFIX}.out" "${GNAPLOGPREFIX}.err" |
263 |
+ rm "${GNAP_LOGPREFIX}.out" "${GNAP_LOGPREFIX}.err" |
264 |
fi |
265 |
fi |
266 |
fi |
267 |
-touch "${GNAPLOGPREFIX}.out" |
268 |
-touch "${GNAPLOGPREFIX}.err" |
269 |
-SEELOGFILES="see ${GNAPLOGPREFIX}.err and .out for details" |
270 |
+touch "${GNAP_LOGPREFIX}.out" |
271 |
+touch "${GNAP_LOGPREFIX}.err" |
272 |
+SEELOGFILES="see ${GNAP_LOGPREFIX}.err and .out for details" |
273 |
|
274 |
# Snapshot preparation |
275 |
if [[ "${NEEDS_SNAPSHOT}" -eq 1 ]]; then |
276 |
@@ -198,34 +204,34 @@ |
277 |
|
278 |
gmkdir "${storedir}/snapshots" |
279 |
|
280 |
- if [[ -z "${PORTAGE_OVERLAYS}" ]]; then |
281 |
- cp "${SNAPSHOTFILE}" "${storedir}/snapshots/portage-${STAMP}.tar.bz2" |
282 |
+ if [[ -z "${GNAP_PORTAGE_OVERLAYS}" ]]; then |
283 |
+ cp "${GNAP_SNAPSHOTFILE}" |
284 |
"${storedir}/snapshots/portage-${GNAP_STAMP}.tar.bz2" |
285 |
gtest $? "Snapshot preparation failed, ${SEELOGFILES}" |
286 |
else |
287 |
TEMPPRTDIR="${TEMPDIR}/portage" |
288 |
gmkdir "${TEMPPRTDIR}" |
289 |
|
290 |
- tar jxf "${SNAPSHOTFILE}" -C "${TEMPPRTDIR}" \ |
291 |
- >> "${GNAPLOGPREFIX}.out" 2>> "${GNAPLOGPREFIX}.err" |
292 |
+ tar jxf "${GNAP_SNAPSHOTFILE}" -C "${TEMPPRTDIR}" \ |
293 |
+ >> "${GNAP_LOGPREFIX}.out" 2>> "${GNAP_LOGPREFIX}.err" |
294 |
|
295 |
- for overlay in ${PORTAGE_OVERLAYS} ; do |
296 |
+ for overlay in ${GNAP_PORTAGE_OVERLAYS} ; do |
297 |
cp -rp ${overlay}/* "${TEMPPRTDIR}/portage" |
298 |
gtest continued $? "Failed to copy ${overlay}" |
299 |
done |
300 |
|
301 |
- tar jcf "${storedir}/snapshots/portage-${STAMP}.tar.bz2" \ |
302 |
+ tar jcf "${storedir}/snapshots/portage-${GNAP_STAMP}.tar.bz2" \ |
303 |
-C "${TEMPPRTDIR}" . \ |
304 |
- >> "${GNAPLOGPREFIX}.out" 2>> "${GNAPLOGPREFIX}.err" |
305 |
+ >> "${GNAP_LOGPREFIX}.out" 2>> "${GNAP_LOGPREFIX}.err" |
306 |
gtest $? "Snapshot preparation failed, ${SEELOGFILES}" |
307 |
fi |
308 |
fi |
309 |
|
310 |
# Stage3 phase |
311 |
-if [[ "${STAGE3}" -eq 1 ]]; then |
312 |
+if [[ "${GNAP_STAGE3}" -eq 1 ]]; then |
313 |
gbegin "${G}[stage3]${N} stage (base system build)" |
314 |
|
315 |
gmkdir "${storedir}/builds/${RELTYPE}" |
316 |
- cp "${STAGE3FILE}" "${storedir}/builds/${RELTYPE}/seedstage.tar.bz2" |
317 |
+ cp "${GNAP_STAGE3FILE}" |
318 |
"${storedir}/builds/${RELTYPE}/seedstage.tar.bz2" |
319 |
|
320 |
TEMPCONF="${TEMPDIR}/stage3.conf" |
321 |
touch "${TEMPCONF}" |
322 |
@@ -235,20 +241,20 @@ |
323 |
${DISTCCSPEC} |
324 |
subarch: ${SUBARCH} |
325 |
rel_type: ${RELTYPE} |
326 |
-snapshot: ${STAMP} |
327 |
-version_stamp: ${STAMP} |
328 |
+snapshot: ${GNAP_STAMP} |
329 |
+version_stamp: ${GNAP_STAMP} |
330 |
profile: ${PROFILE} |
331 |
source_subpath: ${RELTYPE}/seedstage |
332 |
portage_confdir: ${SPECDIR}/portage_confdir |
333 |
EOF |
334 |
- $CATALYST_BIN -c "${CATALYST_CONF}" -f "${TEMPCONF}" \ |
335 |
- >> "${GNAPLOGPREFIX}.out" 2>> "${GNAPLOGPREFIX}.err" |
336 |
+ $GNAP_CATALYST_BIN -c "${GNAP_CATALYST_CONF}" -f "${TEMPCONF}" \ |
337 |
+ >> "${GNAP_LOGPREFIX}.out" 2>> "${GNAP_LOGPREFIX}.err" |
338 |
gtest $? "[stage3] failed, ${SEELOGFILES}" |
339 |
rm "${storedir}/builds/${RELTYPE}/seedstage.tar.bz2" |
340 |
fi |
341 |
|
342 |
# LIVECD-STAGE1 phase |
343 |
-if [[ "${LIVECD1}" -eq 1 ]]; then |
344 |
+if [[ "${GNAP_LIVECD1}" -eq 1 ]]; then |
345 |
gbegin "${G}[livecd-stage1]${N} stage (GNAP-specific packages build)" |
346 |
TEMPCONF="${TEMPDIR}/livecd-stage1.conf" |
347 |
touch "${TEMPCONF}" |
348 |
@@ -258,21 +264,21 @@ |
349 |
${DISTCCSPEC} |
350 |
subarch: ${SUBARCH} |
351 |
rel_type: ${RELTYPE} |
352 |
-snapshot: ${STAMP} |
353 |
-version_stamp: ${STAMP} |
354 |
+snapshot: ${GNAP_STAMP} |
355 |
+version_stamp: ${GNAP_STAMP} |
356 |
profile: ${PROFILE} |
357 |
-source_subpath: ${RELTYPE}/stage3-${SUBARCH}-${STAMP} |
358 |
+source_subpath: ${RELTYPE}/stage3-${SUBARCH}-${GNAP_STAMP} |
359 |
portage_confdir: ${SPECDIR}/portage_confdir |
360 |
EOF |
361 |
cat "${SPECDIR}/packages.conf" >> "${TEMPCONF}" |
362 |
|
363 |
- $CATALYST_BIN -c "${CATALYST_CONF}" -f "${TEMPCONF}" \ |
364 |
- >> "${GNAPLOGPREFIX}.out" 2>> "${GNAPLOGPREFIX}.err" |
365 |
+ $GNAP_CATALYST_BIN -c "${GNAP_CATALYST_CONF}" -f "${TEMPCONF}" \ |
366 |
+ >> "${GNAP_LOGPREFIX}.out" 2>> "${GNAP_LOGPREFIX}.err" |
367 |
gtest $? "[livecd-stage1] failed, ${SEELOGFILES}" |
368 |
fi |
369 |
|
370 |
# LIVECD-STAGE2 phase |
371 |
-if [[ "${LIVECD2}" -eq 1 ]]; then |
372 |
+if [[ "${GNAP_LIVECD2}" -eq 1 ]]; then |
373 |
gbegin "${G}[livecd-stage2]${N} stage (kernel and LiveCD builds)" |
374 |
TEMPCONF="${TEMPDIR}/livecd-stage2.conf" |
375 |
touch "${TEMPCONF}" |
376 |
@@ -282,30 +288,30 @@ |
377 |
${DISTCCSPEC} |
378 |
subarch: ${SUBARCH} |
379 |
rel_type: ${RELTYPE} |
380 |
-snapshot: ${STAMP} |
381 |
-version_stamp: ${STAMP} |
382 |
+snapshot: ${GNAP_STAMP} |
383 |
+version_stamp: ${GNAP_STAMP} |
384 |
profile: ${PROFILE} |
385 |
-source_subpath: ${RELTYPE}/livecd-stage1-${SUBARCH}-${STAMP} |
386 |
+source_subpath: ${RELTYPE}/livecd-stage1-${SUBARCH}-${GNAP_STAMP} |
387 |
boot/kernel/gentoo/sources: ${KERNEL_SOURCES} |
388 |
boot/kernel/gentoo/config: ${SPECDIR}/kernel.config |
389 |
-boot/kernel/gentoo/extraversion: GNAP-${GNAPVERSION} |
390 |
-livecd/iso: gnap-${GNAPVERSION}-${STAMP}.iso |
391 |
+boot/kernel/gentoo/extraversion: GNAP-${VERSION} |
392 |
+livecd/iso: gnap-${VERSION}-${GNAP_STAMP}.iso |
393 |
livecd/fsscript: ${SPECDIR}/fsscript |
394 |
livecd/root_overlay: ${SPECDIR}/root_overlay |
395 |
EOF |
396 |
cat "${SPECDIR}/livecd.conf" >> "${TEMPCONF}" |
397 |
|
398 |
- $CATALYST_BIN -c "${CATALYST_CONF}" -f "${TEMPCONF}" \ |
399 |
- >> "${GNAPLOGPREFIX}.out" 2>> "${GNAPLOGPREFIX}.err" |
400 |
+ $GNAP_CATALYST_BIN -c "${GNAP_CATALYST_CONF}" -f "${TEMPCONF}" \ |
401 |
+ >> "${GNAP_LOGPREFIX}.out" 2>> "${GNAP_LOGPREFIX}.err" |
402 |
gtest $? "[livecd-stage2] failed, ${SEELOGFILES}" |
403 |
fi |
404 |
|
405 |
# TARBALL phase |
406 |
-if [[ "${TARBALL}" -eq 1 ]]; then |
407 |
+if [[ "${GNAP_TARBALL}" -eq 1 ]]; then |
408 |
gbegin "${G}[tarball]${N} phase (Creation of core and basefs |
409 |
components)" |
410 |
- test -e "gnap-${GNAPVERSION}-${STAMP}.iso" |
411 |
- gtest continued $? "No gnap-${GNAPVERSION}-${STAMP}.iso file to |
412 |
convert !" |
413 |
- test -d "${storedir}/tmp/gnap/livecd-stage1-${SUBARCH}-${STAMP}" |
414 |
+ test -e "gnap-${VERSION}-${GNAP_STAMP}.iso" |
415 |
+ gtest continued $? "No gnap-${VERSION}-${GNAP_STAMP}.iso file to |
416 |
convert !" |
417 |
+ test -d "${storedir}/tmp/gnap/livecd-stage1-${SUBARCH}-${GNAP_STAMP}" |
418 |
gtest $? 'Missing livecd-stage2 results' |
419 |
|
420 |
gbegin ' Creating core component' |
421 |
@@ -314,7 +320,7 @@ |
422 |
TEMPISODIR="${TEMPDIR}/iso" |
423 |
gmkdir "${TEMPISODIR}" |
424 |
|
425 |
- mount -o loop "gnap-${GNAPVERSION}-${STAMP}.iso" ${TEMPMNTDIR} && \ |
426 |
+ mount -o loop "gnap-${VERSION}-${GNAP_STAMP}.iso" ${TEMPMNTDIR} && \ |
427 |
cp -r ${TEMPMNTDIR}/* ${TEMPISODIR} |
428 |
gtest continued $? 'Failed to mount ISO and copy files' |
429 |
umount "${TEMPMNTDIR}" |
430 |
@@ -324,23 +330,23 @@ |
431 |
cp "${SPECDIR}/isolinux/syslinux.cfg" ${TEMPISODIR}/ |
432 |
cp "${SPECDIR}/isolinux/boot.msg" ${TEMPISODIR}/isolinux/ |
433 |
DATE=$(date --utc) |
434 |
- echo "GNAP-${GNAPVERSION}-${STAMP} built on ${DATE}" \ |
435 |
+ echo "GNAP-${VERSION}-${GNAP_STAMP} built on ${DATE}" \ |
436 |
>> "${TEMPISODIR}/isolinux/boot.msg" |
437 |
|
438 |
- tar cf "gnap-${GNAPVERSION}-${STAMP}.tar" -C "${TEMPISODIR}" . |
439 |
+ tar cf "gnap-${VERSION}-${GNAP_STAMP}.tar" -C "${TEMPISODIR}" . |
440 |
gtest $? 'Failed to create tarball' |
441 |
- rm "gnap-${GNAPVERSION}-${STAMP}.iso" |
442 |
+ rm "gnap-${VERSION}-${GNAP_STAMP}.iso" |
443 |
|
444 |
gbegin ' Creating basefs component' |
445 |
- tar jcf "gnap-basefs-${GNAPVERSION}-${STAMP}.tar.bz2" \ |
446 |
- -C "${storedir}/tmp/gnap/livecd-stage2-${SUBARCH}-${STAMP}" . |
447 |
+ tar jcf "gnap-basefs-${VERSION}-${GNAP_STAMP}.tar.bz2" \ |
448 |
+ -C "${storedir}/tmp/gnap/livecd-stage2-${SUBARCH}-${GNAP_STAMP}" . |
449 |
gtest $? 'Unable to create basefs tarball' |
450 |
fi |
451 |
|
452 |
# EXTENSIONS phase |
453 |
-if [[ "${MODULES}" -eq 1 ]]; then |
454 |
+if [[ "${GNAP_MODULES}" -eq 1 ]]; then |
455 |
gbegin "${G}[extensions]${N} stage start" |
456 |
- GRP_PREFIX="${storedir}/builds/${RELTYPE}/grp-${SUBARCH}-${STAMP}" |
457 |
+ |
458 |
GRP_PREFIX="${storedir}/builds/${RELTYPE}/grp-${SUBARCH}-${GNAP_STAMP}" |
459 |
SPECMODULE="${SPECDIR}/extensions.conf" |
460 |
mod_list=$(grep '^extensions:' "${SPECMODULE}" 2>/dev/null); |
461 |
mod_list="${mod_list/extensions:/}" |
462 |
@@ -362,25 +368,25 @@ |
463 |
${DISTCCSPEC} |
464 |
subarch: ${SUBARCH} |
465 |
rel_type: ${RELTYPE} |
466 |
-snapshot: ${STAMP} |
467 |
-version_stamp: ${STAMP} |
468 |
+snapshot: ${GNAP_STAMP} |
469 |
+version_stamp: ${GNAP_STAMP} |
470 |
profile: ${PROFILE} |
471 |
-source_subpath: ${RELTYPE}/stage3-${SUBARCH}-${STAMP} |
472 |
+source_subpath: ${RELTYPE}/stage3-${SUBARCH}-${GNAP_STAMP} |
473 |
grp: ${mod_name} |
474 |
grp/use: ${mod_useflags} |
475 |
grp/${mod_name}/type: pkgset |
476 |
grp/${mod_name}/packages: ${mod_packlist} |
477 |
EOF |
478 |
|
479 |
- $CATALYST_BIN -c "${CATALYST_CONF}" -f "${TEMPCONF}" \ |
480 |
- >> "${GNAPLOGPREFIX}.out" 2>> "${GNAPLOGPREFIX}.err" |
481 |
+ $GNAP_CATALYST_BIN -c "${GNAP_CATALYST_CONF}" -f "${TEMPCONF}" \ |
482 |
+ >> "${GNAP_LOGPREFIX}.out" 2>> "${GNAP_LOGPREFIX}.err" |
483 |
gtest continued $? "Extension build failed, ${SEELOGFILES}" |
484 |
|
485 |
TEMPMODULEDIR="${TEMPDIR}/module_${mod_name}" |
486 |
gmkdir "${TEMPMODULEDIR}" |
487 |
for pkg in $( ls ${GRP_PREFIX}/${mod_name}/All/*.tbz2 ); do |
488 |
tar jxf $pkg -C "${TEMPMODULEDIR}" -p \ |
489 |
- >> "${GNAPLOGPREFIX}.out" 2>> "${GNAPLOGPREFIX}.err" |
490 |
+ >> "${GNAP_LOGPREFIX}.out" 2>> "${GNAP_LOGPREFIX}.err" |
491 |
done |
492 |
gtest continued $? 'Failed to unpack extension packages' |
493 |
|
494 |
@@ -392,9 +398,9 @@ |
495 |
rm -rf ${mod_rmlist} |
496 |
gtest continued $? 'Failed to apply extension cleanup instructions' |
497 |
|
498 |
- tar jcf "gnapext_${mod_name}-${STAMP}.tbz2" \ |
499 |
+ tar jcf "gnapext_${mod_name}-${GNAP_STAMP}.tbz2" \ |
500 |
-C "${TEMPMODULEDIR}" . \ |
501 |
- >> "${GNAPLOGPREFIX}.out" 2>> "${GNAPLOGPREFIX}.err" |
502 |
+ >> "${GNAP_LOGPREFIX}.out" 2>> "${GNAP_LOGPREFIX}.err" |
503 |
gtest $? 'Failed to build extension file' |
504 |
done |
505 |
fi |
506 |
diff -ur --exclude .svn --exclude upload.sh --exclude diff.sh gnap-2.0 |
507 |
+cleanup+split/tools/gnap_overlay gnap-2.0+cleanup+split |
508 |
+namespace/tools/gnap_overlay |
509 |
--- gnap-2.0+cleanup+split/tools/gnap_overlay 2007-07-27 |
510 |
16:00:56.000000000 +0300 |
511 |
+++ gnap-2.0+cleanup+split+namespace/tools/gnap_overlay 2007-07-27 |
512 |
16:00:02.000000000 +0300 |
513 |
@@ -1,17 +1,15 @@ |
514 |
#!/bin/bash |
515 |
VERSION='2.0' |
516 |
|
517 |
-GNAPLIBDIR='/usr/lib/gnap' |
518 |
-source ${GNAPLIBDIR}/gnap_shared.sh |
519 |
-echo "GNAP overlay tool ${GNAPNAME} ${VERSION}" |
520 |
- |
521 |
-IMG_SIZE=15 |
522 |
+GNAP_LIBDIR='/usr/lib/gnap' |
523 |
+source ${GNAP_LIBDIR}/gnap_shared.sh |
524 |
+echo "GNAP overlay tool ${NAME} ${VERSION}" |
525 |
|
526 |
usage() { |
527 |
echo |
528 |
echo 'Usage:' |
529 |
- echo " ${GNAPNAME} -i isoname -o overlay [ options ]" |
530 |
- echo " ${GNAPNAME} -d hostdisk -r rootdev -o overlay [ options ]" |
531 |
+ echo " ${NAME} -i isoname -o overlay [ options ]" |
532 |
+ echo " ${NAME} -d hostdisk -r rootdev -o overlay [ options ]" |
533 |
echo |
534 |
echo 'Common options:' |
535 |
echo ' -o overlay Overlay directory or tbz2 file' |
536 |
@@ -36,7 +34,7 @@ |
537 |
echo ' -S size Size of image file in megabyte' |
538 |
echo ' The disk target options also apply, except -d.' |
539 |
echo |
540 |
- echo "Please use man ${GNAPNAME} for more details." |
541 |
+ echo "Please use man ${NAME} for more details." |
542 |
} |
543 |
|
544 |
if [[ "$#" -eq 0 || "${1}" == '-h' ]]; then |
545 |
@@ -47,105 +45,106 @@ |
546 |
gbegin 'Checking parameters' |
547 |
|
548 |
# Read options |
549 |
-NOLOGO=0 |
550 |
-FORCEYES=0 |
551 |
-OUTPUT='' |
552 |
-TYPE='' |
553 |
-CREATE='n' |
554 |
-TARGETROOT='' |
555 |
-CACHE='' |
556 |
-SERIAL='' |
557 |
-BAUDRATE='' |
558 |
+GNAP_NOLOGO=0 |
559 |
+GNAP_FORCEYES=0 |
560 |
+GNAP_OUTPUT='' |
561 |
+GNAP_TYPE='' |
562 |
+GNAP_CREATE='n' |
563 |
+GNAP_IMG_SIZE=15 |
564 |
+GNAP_TARGETROOT='' |
565 |
+GNAP_CACHE='' |
566 |
+GNAP_SERIAL='' |
567 |
+GNAP_BAUDRATE='' |
568 |
while getopts ':hg:o:c:nfi:d:l:r:ms:S:L:' option; do |
569 |
case ${option} in |
570 |
h ) usage |
571 |
exit 0;; |
572 |
- g ) GNAPCORE="${OPTARG}";; |
573 |
- o ) OVERLAYS="${OVERLAYS} ${OPTARG}";; |
574 |
- c ) OVERLAYCONF="${OPTARG}";; |
575 |
- n ) NOLOGO=1;; |
576 |
- f ) FORCEYES=1;; |
577 |
- i ) OUTPUT="${OPTARG}" |
578 |
- TYPE='iso';; |
579 |
- d ) OUTPUT="${OPTARG}" |
580 |
- TYPE='disk';; |
581 |
- l ) OUTPUT="${OPTARG}" |
582 |
- TYPE='image' |
583 |
- CREATE='n';; |
584 |
- L ) OUTPUT="${OPTARG}" |
585 |
- TYPE='image' |
586 |
- CREATE='y';; |
587 |
- S ) IMG_SIZE="${OPTARG}";; |
588 |
- r ) TARGETROOT="${OPTARG}";; |
589 |
- m ) CACHE='docache ';; |
590 |
- s ) SERIAL="console=ttyS0,${OPTARG}n81" |
591 |
- BAUDRATE="${OPTARG}";; |
592 |
+ g ) GNAP_CORE="${OPTARG}";; |
593 |
+ o ) GNAP_OVERLAYS="${GNAP_OVERLAYS} ${OPTARG}";; |
594 |
+ c ) GNAP_OVERLAY_CONF="${OPTARG}";; |
595 |
+ n ) GNAP_NOLOGO=1;; |
596 |
+ f ) GNAP_FORCEYES=1;; |
597 |
+ i ) GNAP_OUTPUT="${OPTARG}" |
598 |
+ GNAP_TYPE='iso';; |
599 |
+ d ) GNAP_OUTPUT="${OPTARG}" |
600 |
+ GNAP_TYPE='disk';; |
601 |
+ l ) GNAP_OUTPUT="${OPTARG}" |
602 |
+ GNAP_TYPE='image' |
603 |
+ GNAP_CREATE='n';; |
604 |
+ L ) GNAP_OUTPUT="${OPTARG}" |
605 |
+ GNAP_TYPE='image' |
606 |
+ GNAP_CREATE='y';; |
607 |
+ S ) GNAP_IMG_SIZE="${OPTARG}";; |
608 |
+ r ) GNAP_TARGETROOT="${OPTARG}";; |
609 |
+ m ) GNAP_CACHE='docache ';; |
610 |
+ s ) GNAP_SERIAL="console=ttyS0,${OPTARG}n81" |
611 |
+ GNAP_BAUDRATE="${OPTARG}";; |
612 |
* ) gtest 1 'Specified options are incomplete or unknown!';; |
613 |
esac |
614 |
done |
615 |
|
616 |
# Target type (-i or -d) is needed |
617 |
-test -n "${TYPE}" |
618 |
+test -n "${GNAP_TYPE}" |
619 |
gtest continued $? 'Please specify a target (-i or -d option)' |
620 |
|
621 |
# Core file is required |
622 |
-test -f "${GNAPCORE}" |
623 |
+test -f "${GNAP_CORE}" |
624 |
gtest continued $? 'Please specify a valid GNAP core file (-g option)' |
625 |
|
626 |
-case "${TYPE}" in |
627 |
+case "${GNAP_TYPE}" in |
628 |
disk) |
629 |
# if disk type, doublecheck everything is ok |
630 |
- PARENTDEV="${OUTPUT:0:$((${#OUTPUT}-1))}" |
631 |
+ PARENTDEV="${GNAP_OUTPUT:0:$((${#GNAP_OUTPUT}-1))}" |
632 |
test -b "${PARENTDEV}" |
633 |
gtest continued $? "${PARENTDEV} device does not exist on this |
634 |
system" |
635 |
- test -b "${OUTPUT}" |
636 |
- gtest continued $? "${OUTPUT} partition does not exist on this |
637 |
system" |
638 |
+ test -b "${GNAP_OUTPUT}" |
639 |
+ gtest continued $? "${GNAP_OUTPUT} partition does not exist on this |
640 |
system" |
641 |
;; |
642 |
image) |
643 |
- if [[ "${CREATE}" != 'y' ]]; then |
644 |
+ if [[ "${GNAP_CREATE}" != 'y' ]]; then |
645 |
# Check whether image file exists |
646 |
- test -f "${OUTPUT}" |
647 |
- gtest continued $? "Image file ${OUTPUT} does not exist." |
648 |
+ test -f "${GNAP_OUTPUT}" |
649 |
+ gtest continued $? "Image file ${GNAP_OUTPUT} does not exist." |
650 |
fi |
651 |
;; |
652 |
esac |
653 |
|
654 |
# At least one overlay is required |
655 |
-test -n "${OVERLAYS}${OVERLAYCONF}" |
656 |
+test -n "${GNAP_OVERLAYS}${GNAP_OVERLAY_CONF}" |
657 |
gtest $? 'Please specify at least an overlay (-o) or config file (-c)' |
658 |
|
659 |
# Warning for disk type targets |
660 |
-if [[ "${TYPE}" == 'disk' ]]; then |
661 |
+if [[ "${GNAP_TYPE}" == 'disk' ]]; then |
662 |
gwarn 'Warning : you have selected disk install' |
663 |
- gwarn "Make sure you are root or have full access to ${OUTPUT}" |
664 |
+ gwarn "Make sure you are root or have full access to ${GNAP_OUTPUT}" |
665 |
gwarn "${PARENTDEV} must have an MBR installed, run:" |
666 |
- gwarn "${W}dd if=${GNAPMBR} of=${PARENTDEV} bs=512 count=1${N} if |
667 |
needed" |
668 |
- gwarn "${OUTPUT} must contain an active partition:" |
669 |
+ gwarn "${W}dd if=${GNAP_MBR} of=${PARENTDEV} bs=512 count=1${N} if |
670 |
needed" |
671 |
+ gwarn "${GNAP_OUTPUT} must contain an active partition:" |
672 |
gwarn " use ${W}fdisk ${PARENTDEV}${N} if needed" |
673 |
- gwarn "Current data on ${OUTPUT} will be ${B}destroyed${N}!" |
674 |
+ gwarn "Current data on ${GNAP_OUTPUT} will be ${B}destroyed${N}!" |
675 |
gconfirm 'Are you sure you want to continue ?' |
676 |
fi |
677 |
|
678 |
# Common actions |
679 |
-gbegin "Expanding ${GNAPCORE} core" |
680 |
+gbegin "Expanding ${GNAP_CORE} core" |
681 |
TEMPDIR=$(mktemp -d -t gnap_overlay.XXXXXX) |
682 |
gtest continued $? 'Failed to create temporary directory' |
683 |
TEMPCOREDIR="${TEMPDIR}/core" |
684 |
gmkdir "${TEMPCOREDIR}" |
685 |
-tar x -C "${TEMPCOREDIR}" -f "${GNAPCORE}" |
686 |
+tar x -C "${TEMPCOREDIR}" -f "${GNAP_CORE}" |
687 |
gtest $? 'Failed to extract core' |
688 |
|
689 |
gbegin 'Preparing overlay' |
690 |
TEMPOVERDIR="${TEMPDIR}/overlay" |
691 |
gmkdir "${TEMPOVERDIR}" |
692 |
|
693 |
-if [[ -n "${BAUDRATE}" ]]; then |
694 |
+if [[ -n "${GNAP_BAUDRATE}" ]]; then |
695 |
gbegin 'Adding baudrate for serial console' |
696 |
gmkdir -p "${TEMPOVERDIR}/etc/gnap" |
697 |
- echo -n "${BAUDRATE}" > "${TEMPOVERDIR}/etc/gnap/baudrate" |
698 |
+ echo -n "${GNAP_BAUDRATE}" > "${TEMPOVERDIR}/etc/gnap/baudrate" |
699 |
gtest $? 'Failed to create /etc/gnap/baudrate' |
700 |
fi |
701 |
-for overlay in ${OVERLAYS} ; do |
702 |
+for overlay in ${GNAP_OVERLAYS} ; do |
703 |
if [[ -d "${overlay}" ]]; then |
704 |
gbegin "Adding ${overlay} (directory overlay)" |
705 |
cp -rp "${overlay}"/* "${TEMPOVERDIR}" |
706 |
@@ -156,13 +155,13 @@ |
707 |
gtest $? "${overlay} is not a valid conflet file (tbz2 format)" |
708 |
fi |
709 |
done |
710 |
-if [[ -n "${OVERLAYCONF}" ]]; then |
711 |
- gbegin "Adding ${OVERLAYCONF} (overlay.conf file)" |
712 |
+if [[ -n "${GNAP_OVERLAY_CONF}" ]]; then |
713 |
+ gbegin "Adding ${GNAP_OVERLAY_CONF} (overlay.conf file)" |
714 |
if [[ ! -d "${TEMPOVERDIR}/etc" ]]; then |
715 |
gmkdir "${TEMPOVERDIR}/etc" |
716 |
fi |
717 |
- cp "${OVERLAYCONF}" "${TEMPOVERDIR}/etc/overlay.conf" |
718 |
- gtest $? "Failed to copy ${OVERLAYCONF}" |
719 |
+ cp "${GNAP_OVERLAY_CONF}" "${TEMPOVERDIR}/etc/overlay.conf" |
720 |
+ gtest $? "Failed to copy ${GNAP_OVERLAY_CONF}" |
721 |
fi |
722 |
gbegin 'Creating overlay tarball' |
723 |
test -f "${TEMPOVERDIR}/etc/overlay.conf" |
724 |
@@ -172,28 +171,28 @@ |
725 |
gtest $? 'Failed to create overlay tarball' |
726 |
|
727 |
DATE=$(date --utc) |
728 |
-if [[ "${NOLOGO}" -eq 1 ]]; then |
729 |
+if [[ "${GNAP_NOLOGO}" -eq 1 ]]; then |
730 |
echo "GNAP ${VERSION}" > "${TEMPCOREDIR}/isolinux/boot.msg" |
731 |
fi |
732 |
-if [[ -n "${OVERLAYS}" ]]; then |
733 |
- echo "Overlaid with ${OVERLAYS} on ${DATE}" \ |
734 |
+if [[ -n "${GNAP_OVERLAYS}" ]]; then |
735 |
+ echo "Overlaid with ${GNAP_OVERLAYS} on ${DATE}" \ |
736 |
>> "${TEMPCOREDIR}/isolinux/boot.msg" |
737 |
fi |
738 |
|
739 |
# Target specific actions |
740 |
-if [[ "${TYPE}" == 'iso' ]]; then |
741 |
- if [[ -f "${OUTPUT}" ]]; then |
742 |
- gconfirm "File ${OUTPUT} already exists, overwrite?" |
743 |
+if [[ "${GNAP_TYPE}" == 'iso' ]]; then |
744 |
+ if [[ -f "${GNAP_OUTPUT}" ]]; then |
745 |
+ gconfirm "File ${GNAP_OUTPUT} already exists, overwrite?" |
746 |
fi |
747 |
rm "${TEMPCOREDIR}/syslinux.cfg" |
748 |
- gbegin "Building ${OUTPUT} ISO file" |
749 |
- mkisofs -quiet -J -r -l -x "${TEMPCOREDIR}/.." -o "${OUTPUT}" \ |
750 |
+ gbegin "Building ${GNAP_OUTPUT} ISO file" |
751 |
+ mkisofs -quiet -J -r -l -x "${TEMPCOREDIR}/.." -o "${GNAP_OUTPUT}" \ |
752 |
-b isolinux/isolinux.bin -c isolinux/boot.cat \ |
753 |
-no-emul-boot -boot-load-size 4 -boot-info-table "${TEMPCOREDIR}" |
754 |
gtest $? |
755 |
|
756 |
else |
757 |
- if [[ "${TYPE}" == 'image' ]]; then |
758 |
+ if [[ "${GNAP_TYPE}" == 'image' ]]; then |
759 |
gbegin 'Looking for free loop device' |
760 |
LOOP='' |
761 |
for i in /dev/loop/?* /dev/loop?*; do |
762 |
@@ -210,25 +209,25 @@ |
763 |
|
764 |
ginfo "Using loop device ${LOOP}" |
765 |
|
766 |
- if [[ "${CREATE}" == y ]]; then |
767 |
- if [[ -f "${OUTPUT}" ]]; then |
768 |
- gconfirm "File ${OUTPUT} already exists, overwrite?" |
769 |
+ if [[ "${GNAP_CREATE}" == y ]]; then |
770 |
+ if [[ -f "${GNAP_OUTPUT}" ]]; then |
771 |
+ gconfirm "File ${GNAP_OUTPUT} already exists, overwrite?" |
772 |
fi |
773 |
|
774 |
gbegin 'Creating image file' |
775 |
# 1048576 = 1 MiB |
776 |
- dd if=/dev/zero of="${OUTPUT}" bs=1048576 count="${IMG_SIZE}" \ |
777 |
+ dd if=/dev/zero of="${GNAP_OUTPUT}" bs=1048576 |
778 |
count="${GNAP_IMG_SIZE}" \ |
779 |
>/dev/null 2>&1 |
780 |
gtest $? |
781 |
|
782 |
gbegin 'Creating partition table' |
783 |
# Create one partition of the full size |
784 |
- echo '0;;6;*' | sfdisk -D -H 64 -S 32 "${OUTPUT}" >/dev/null 2>&1 |
785 |
+ echo '0;;6;*' | sfdisk -D -H 64 -S 32 "${GNAP_OUTPUT}" >/dev/null |
786 |
2>&1 |
787 |
gtest $? |
788 |
fi |
789 |
|
790 |
gbegin 'Reading Cylinder/Heads/Sectors' |
791 |
- CHS=$(sfdisk -G "${OUTPUT}" 2>/dev/null) |
792 |
+ CHS=$(sfdisk -G "${GNAP_OUTPUT}" 2>/dev/null) |
793 |
gtest $? |
794 |
|
795 |
set -- ${CHS/*:/} |
796 |
@@ -241,22 +240,22 @@ |
797 |
|
798 |
ginfo "Offset is ${offset}" |
799 |
|
800 |
- gbegin "Mounting ${OUTPUT} to ${LOOP}" |
801 |
- losetup -o "${offset}" "${LOOP}" "${OUTPUT}" |
802 |
+ gbegin "Mounting ${GNAP_OUTPUT} to ${LOOP}" |
803 |
+ losetup -o "${offset}" "${LOOP}" "${GNAP_OUTPUT}" |
804 |
gtest $? |
805 |
|
806 |
- ORIG_OUTPUT="${OUTPUT}" |
807 |
- OUTPUT="${LOOP}" |
808 |
+ ORIG_OUTPUT="${GNAP_OUTPUT}" |
809 |
+ GNAP_OUTPUT="${LOOP}" |
810 |
fi |
811 |
|
812 |
- gbegin "Formatting ${OUTPUT}" |
813 |
- mkfs.msdos "${OUTPUT}" > /dev/null 2>&1 |
814 |
+ gbegin "Formatting ${GNAP_OUTPUT}" |
815 |
+ mkfs.msdos "${GNAP_OUTPUT}" > /dev/null 2>&1 |
816 |
gtest $? |
817 |
|
818 |
- gbegin "Mounting ${OUTPUT}" |
819 |
+ gbegin "Mounting ${GNAP_OUTPUT}" |
820 |
TEMPMOUNTDIR="${TEMPDIR}/mount" |
821 |
gmkdir "${TEMPMOUNTDIR}" |
822 |
- mount -t msdos "${OUTPUT}" "${TEMPMOUNTDIR}" |
823 |
+ mount -t msdos "${GNAP_OUTPUT}" "${TEMPMOUNTDIR}" |
824 |
gtest $? |
825 |
|
826 |
gbegin 'Copying files' |
827 |
@@ -268,31 +267,31 @@ |
828 |
cp ${TEMPCOREDIR}/overlay.tgz ${TEMPMOUNTDIR}/ &&\ |
829 |
cp ${TEMPCOREDIR}/image.squashfs ${TEMPMOUNTDIR}/image.sfs &&\ |
830 |
sed -i \ |
831 |
- "s:cdroot:cdroot=/dev/${TARGETROOT} ${CACHE}${SERIAL}:" \ |
832 |
+ "s:cdroot:cdroot=/dev/${GNAP_TARGETROOT} |
833 |
${GNAP_CACHE}${GNAP_SERIAL}:" \ |
834 |
"${TEMPMOUNTDIR}/syslinux.cfg" |
835 |
gtest $? |
836 |
|
837 |
- gbegin "Unmounting ${OUTPUT}" |
838 |
+ gbegin "Unmounting ${GNAP_OUTPUT}" |
839 |
umount "${TEMPMOUNTDIR}" |
840 |
gtest $? |
841 |
|
842 |
# Is autocleaned so maybe not useful |
843 |
- if [[ "${TYPE}" == 'image' ]]; then |
844 |
+ if [[ "${GNAP_TYPE}" == 'image' ]]; then |
845 |
losetup -d "${LOOP}" |
846 |
LOOP= |
847 |
fi |
848 |
|
849 |
export MTOOLS_SKIP_CHECK=1 |
850 |
- case "${TYPE}" in |
851 |
+ case "${GNAP_TYPE}" in |
852 |
disk) |
853 |
gbegin 'Syslinuxing' |
854 |
- syslinux "${OUTPUT}" |
855 |
+ syslinux "${GNAP_OUTPUT}" |
856 |
gtest $? |
857 |
;; |
858 |
image) |
859 |
gbegin 'Preparing disk for boot' |
860 |
syslinux -o "${offset}" "${ORIG_OUTPUT}" && \ |
861 |
- dd if="${GNAPMBR}" of="${ORIG_OUTPUT}" bs=512 count=1 \ |
862 |
+ dd if="${GNAP_MBR}" of="${ORIG_OUTPUT}" bs=512 count=1 \ |
863 |
conv=notrunc >/dev/null 2>&1 |
864 |
gtest $? |
865 |
;; |
866 |
diff -ur --exclude .svn --exclude upload.sh --exclude diff.sh gnap-2.0 |
867 |
+cleanup+split/tools/gnap_remaster gnap-2.0+cleanup+split |
868 |
+namespace/tools/gnap_remaster |
869 |
--- gnap-2.0+cleanup+split/tools/gnap_remaster 2007-07-27 |
870 |
16:10:54.000000000 +0300 |
871 |
+++ gnap-2.0+cleanup+split+namespace/tools/gnap_remaster 2007-07-27 |
872 |
16:17:48.000000000 +0300 |
873 |
@@ -1,16 +1,16 @@ |
874 |
#!/bin/bash |
875 |
VERSION='2.0' |
876 |
|
877 |
-GNAPLIBDIR='/usr/lib/gnap' |
878 |
-source ${GNAPLIBDIR}/gnap_shared.sh |
879 |
-echo "GNAP remastering tool ${GNAPNAME} ${VERSION}" |
880 |
+GNAP_LIBDIR='/usr/lib/gnap' |
881 |
+source ${GNAP_LIBDIR}/gnap_shared.sh |
882 |
+echo "GNAP remastering tool ${NAME} ${VERSION}" |
883 |
|
884 |
-OUTPUT='mygnap-core.tar' |
885 |
+GNAP_OUTPUT='mygnap-core.tar' |
886 |
|
887 |
usage() { |
888 |
echo |
889 |
echo 'Usage:' |
890 |
- echo " ${GNAPNAME} [ options ]" |
891 |
+ echo " ${NAME} [ options ]" |
892 |
echo |
893 |
echo 'Options:' |
894 |
echo ' -e extension Extension to include in core file' |
895 |
@@ -22,7 +22,7 @@ |
896 |
echo ' -d extdir Directory where to find extensions' |
897 |
echo ' -f Force all answers to yes (dangerous!)' |
898 |
echo |
899 |
- echo "Please use man ${GNAPNAME} for more details." |
900 |
+ echo "Please use man ${NAME} for more details." |
901 |
} |
902 |
|
903 |
if [[ "$#" -eq 0 || "${1}" == '-h' ]]; then |
904 |
@@ -33,64 +33,64 @@ |
905 |
gbegin 'Checking parameters' |
906 |
|
907 |
# Read options |
908 |
-EXTENSIONS='' |
909 |
-KERNEXT='' |
910 |
-MODEXT='' |
911 |
-GNAPBASEFS='' |
912 |
-GNAPEXTDIR='' |
913 |
-FORCEYES=0 |
914 |
+GNAP_EXTENSIONS='' |
915 |
+GNAP_KERNEXT='' |
916 |
+GNAP_MODEXT='' |
917 |
+GNAP_BASEFS='' |
918 |
+GNAP_EXTDIR='' |
919 |
+GNAP_FORCEYES=0 |
920 |
while getopts ':he:k:m:o:g:b:d:f' option; do |
921 |
case ${option} in |
922 |
h ) usage |
923 |
exit 0;; |
924 |
- e ) EXTENSIONS="${EXTENSIONS} ${OPTARG}";; |
925 |
- k ) KERNEXT="${OPTARG}";; |
926 |
- m ) MODEXT="${OPTARG}";; |
927 |
- o ) OUTPUT="${OPTARG}";; |
928 |
- g ) GNAPCORE="${OPTARG}";; |
929 |
- b ) GNAPBASEFS="${OPTARG}";; |
930 |
- d ) GNAPEXTDIR="${OPTARG}";; |
931 |
- f ) FORCEYES=1;; |
932 |
+ e ) GNAP_EXTENSIONS="${GNAP_EXTENSIONS} ${OPTARG}";; |
933 |
+ k ) GNAP_KERNEXT="${OPTARG}";; |
934 |
+ m ) GNAP_MODEXT="${OPTARG}";; |
935 |
+ o ) GNAP_OUTPUT="${OPTARG}";; |
936 |
+ g ) GNAP_CORE="${OPTARG}";; |
937 |
+ b ) GNAP_BASEFS="${OPTARG}";; |
938 |
+ d ) GNAP_EXTDIR="${OPTARG}";; |
939 |
+ f ) GNAP_FORCEYES=1;; |
940 |
* ) gtest 1 'Specified options are incomplete or unknown!';; |
941 |
esac |
942 |
done |
943 |
|
944 |
# Root is needed |
945 |
test "${EUID}" -eq 0 |
946 |
-gtest continued $? "You need to be root to run ${GNAPNAME}" |
947 |
+gtest continued $? "You need to be root to run ${NAME}" |
948 |
|
949 |
# basefs file is required |
950 |
-test -f "${GNAPBASEFS}" |
951 |
+test -f "${GNAP_BASEFS}" |
952 |
gtest continued $? 'Please specify a valid GNAP basefs file (-b |
953 |
option)' |
954 |
|
955 |
# core file is required |
956 |
-test -f "${GNAPCORE}" |
957 |
+test -f "${GNAP_CORE}" |
958 |
gtest continued $? 'Please specify a valid GNAP core file (-g option)' |
959 |
|
960 |
# At least one operation is required |
961 |
-test -n "${EXTENSIONS}" -o -n "${KERNEXT}" -o -n "${MODEXT}" |
962 |
+test -n "${GNAP_EXTENSIONS}" -o -n "${GNAP_KERNEXT}" -o -n |
963 |
"${GNAP_MODEXT}" |
964 |
gtest $? 'Please specify at least one operation (-e, -k, -m) to |
965 |
perform' |
966 |
|
967 |
# Confirm tarball overwrite |
968 |
-if [[ -e "${OUTPUT}" ]]; then |
969 |
- gconfirm "${OUTPUT} already exists, overwrite" |
970 |
+if [[ -e "${GNAP_OUTPUT}" ]]; then |
971 |
+ gconfirm "${GNAP_OUTPUT} already exists, overwrite" |
972 |
fi |
973 |
|
974 |
# Preparing new FS |
975 |
-gbegin "Unpacking ${GNAPBASEFS} basefs" |
976 |
+gbegin "Unpacking ${GNAP_BASEFS} basefs" |
977 |
TEMPDIR=$(mktemp -d -t gnap_remaster.XXXXXX) |
978 |
gtest continued $? 'Failed to create temporary directory' |
979 |
TEMPOVERDIR="${TEMPDIR}/basefs" |
980 |
gmkdir "${TEMPOVERDIR}" |
981 |
|
982 |
-tar jx -C "${TEMPOVERDIR}" -f "${GNAPBASEFS}" |
983 |
+tar jx -C "${TEMPOVERDIR}" -f "${GNAP_BASEFS}" |
984 |
gtest $? 'Failed to unpack basefs' |
985 |
|
986 |
-for overlay in ${EXTENSIONS} ; do |
987 |
+for overlay in ${GNAP_EXTENSIONS} ; do |
988 |
gbegin "Adding ${overlay} extension" |
989 |
- test -f "${GNAPEXTDIR}/gnapext_${overlay}.tbz2" |
990 |
- gtest continued $? "${GNAPEXTDIR}/gnapext_${overlay}.tbz2 does not |
991 |
exist" |
992 |
- tar jxf "${GNAPEXTDIR}/gnapext_${overlay}.tbz2" -C "${TEMPOVERDIR}" |
993 |
+ test -f "${GNAP_EXTDIR}/gnapext_${overlay}.tbz2" |
994 |
+ gtest continued $? "${GNAP_EXTDIR}/gnapext_${overlay}.tbz2 does not |
995 |
exist" |
996 |
+ tar jxf "${GNAP_EXTDIR}/gnapext_${overlay}.tbz2" -C "${TEMPOVERDIR}" |
997 |
gtest $? "${overlay} is not a valid extension (tbz2 format)" |
998 |
done |
999 |
|
1000 |
@@ -99,31 +99,31 @@ |
1001 |
TEMPCOREDIR="${TEMPDIR}/core" |
1002 |
gmkdir "${TEMPCOREDIR}" |
1003 |
|
1004 |
-tar x -C "${TEMPCOREDIR}" -f "${GNAPCORE}" --exclude image.squashfs |
1005 |
+tar x -C "${TEMPCOREDIR}" -f "${GNAP_CORE}" --exclude image.squashfs |
1006 |
gtest $? 'Failed to extract core' |
1007 |
|
1008 |
-if [[ -f "${KERNEXT}" ]]; then |
1009 |
- gbegin "Replacing kernel and initrd using ${KERNEXT}" |
1010 |
+if [[ -f "${GNAP_KERNEXT}" ]]; then |
1011 |
+ gbegin "Replacing kernel and initrd using ${GNAP_KERNEXT}" |
1012 |
TEMPKERNDIR="${TEMPDIR}/kernel" |
1013 |
gmkdir "${TEMPKERNDIR}" |
1014 |
|
1015 |
- tar jx -C "${TEMPKERNDIR}" -f "${KERNEXT}" |
1016 |
+ tar jx -C "${TEMPKERNDIR}" -f "${GNAP_KERNEXT}" |
1017 |
gtest continued $? 'Failed to extract kernpackage' |
1018 |
cp ${TEMPKERNDIR}/kernel* "${TEMPCOREDIR}/isolinux/gentoo" && \ |
1019 |
cp ${TEMPKERNDIR}/initr* "${TEMPCOREDIR}/isolinux/gentoo.igz" |
1020 |
gtest $? 'Failed to copy kernel and initrd' |
1021 |
|
1022 |
-elif [[ -n "${KERNEXT}" ]]; then |
1023 |
- gwarn "${KERNEXT} does not exist, ignoring..." |
1024 |
+elif [[ -n "${GNAP_KERNEXT}" ]]; then |
1025 |
+ gwarn "${GNAP_KERNEXT} does not exist, ignoring..." |
1026 |
fi |
1027 |
|
1028 |
-if [[ -f "${MODEXT}" ]]; then |
1029 |
- gbegin "Replacing modules using ${MODEXT}" |
1030 |
+if [[ -f "${GNAP_MODEXT}" ]]; then |
1031 |
+ gbegin "Replacing modules using ${GNAP_MODEXT}" |
1032 |
rm -rf "${TEMPOVERDIR}/lib/modules" && |
1033 |
- tar jx -C "${TEMPOVERDIR}" -f "${MODEXT}" |
1034 |
+ tar jx -C "${TEMPOVERDIR}" -f "${GNAP_MODEXT}" |
1035 |
gtest $? 'Failed to replace modules' |
1036 |
-elif [[ -n "${MODEXT}" ]]; then |
1037 |
- gwarn "${MODEXT} does not exist, ignoring..." |
1038 |
+elif [[ -n "${GNAP_MODEXT}" ]]; then |
1039 |
+ gwarn "${GNAP_MODEXT} does not exist, ignoring..." |
1040 |
fi |
1041 |
|
1042 |
gbegin 'Creating new squashfs filesystem' |
1043 |
@@ -131,8 +131,8 @@ |
1044 |
> /dev/null 2>/dev/null |
1045 |
gtest $? 'Failed to create squashfs' |
1046 |
|
1047 |
-gbegin "Creating ${OUTPUT} core file" |
1048 |
-tar cf "${OUTPUT}" -C "${TEMPCOREDIR}" . |
1049 |
+gbegin "Creating ${GNAP_OUTPUT} core file" |
1050 |
+tar cf "${GNAP_OUTPUT}" -C "${TEMPCOREDIR}" . |
1051 |
gtest $? 'Failed to create new core tarball' |
1052 |
|
1053 |
# Successful finish |
1054 |
diff -ur --exclude .svn --exclude upload.sh --exclude diff.sh gnap-2.0 |
1055 |
+cleanup+split/tools/gnap_shared.sh gnap-2.0+cleanup+split |
1056 |
+namespace/tools/gnap_shared.sh |
1057 |
--- gnap-2.0+cleanup+split/tools/gnap_shared.sh 2007-08-02 |
1058 |
15:54:46.000000000 +0300 |
1059 |
+++ gnap-2.0+cleanup+split+namespace/tools/gnap_shared.sh 2007-08-02 |
1060 |
15:51:30.000000000 +0300 |
1061 |
@@ -1,22 +1,22 @@ |
1062 |
-GNAPNAME=$(basename "$0") |
1063 |
+NAME=$(basename "$0") |
1064 |
|
1065 |
-case ${GNAPNAME} in |
1066 |
+case ${NAME} in |
1067 |
gnap_make ) GNAP_PRODUCT="Build";; |
1068 |
gnap_overlay ) GNAP_PRODUCT="Overlay";; |
1069 |
gnap_remaster ) GNAP_PRODUCT="Remaster";; |
1070 |
* ) GNAP_PRODUCT="Something";; |
1071 |
esac |
1072 |
-STAGE3FILE="${GNAPLIBDIR}/gnap-stage3seed.tar.bz2" |
1073 |
-SNAPSHOTFILE="${GNAPLIBDIR}/gnap-portagesnapshot.tar.bz2" |
1074 |
-SPECS="${GNAPLIBDIR}/gnap-specs.tar.bz2" |
1075 |
-GNAPCORE="${GNAPLIBDIR}/gnap-core.tar" |
1076 |
-GNAPMBR="${GNAPLIBDIR}/mbr/mbr.bin" |
1077 |
-GNAPEXTDIR="${GNAPLIBDIR}/extensions" |
1078 |
-GNAPBASEFS="${GNAPLIBDIR}/gnap-basefs.tar.bz2" |
1079 |
+GNAP_STAGE3FILE="${GNAP_LIBDIR}/gnap-stage3seed.tar.bz2" |
1080 |
+GNAP_SNAPSHOTFILE="${GNAP_LIBDIR}/gnap-portagesnapshot.tar.bz2" |
1081 |
+GNAP_SPECS="${GNAP_LIBDIR}/gnap-specs.tar.bz2" |
1082 |
+GNAP_CORE="${GNAP_LIBDIR}/gnap-core.tar" |
1083 |
+GNAP_MBR="${GNAP_LIBDIR}/mbr/mbr.bin" |
1084 |
+GNAP_EXTDIR="${GNAP_LIBDIR}/extensions" |
1085 |
+GNAP_BASEFS="${GNAP_LIBDIR}/gnap-basefs.tar.bz2" |
1086 |
|
1087 |
+GNAP_FORCEYES=0 |
1088 |
TEMPDIR='' |
1089 |
LOOP='' |
1090 |
-FORCEYES=0 |
1091 |
|
1092 |
G=$'\e[32;01m' |
1093 |
B=$'\e[31;01m' |
1094 |
@@ -40,7 +40,7 @@ |
1095 |
} |
1096 |
|
1097 |
gconfirm() { |
1098 |
- if [[ "${FORCEYES}" -eq 1 ]]; then |
1099 |
+ if [[ "${GNAP_FORCEYES}" -eq 1 ]]; then |
1100 |
gwarn "${*} forced to yes" |
1101 |
else |
1102 |
read -ep " ${W}*${N} ${*} [N]: " answer |
1103 |
@@ -79,7 +79,7 @@ |
1104 |
if [[ -n "${TEMPDIR}" || -n "${LOOP}" ]]; then |
1105 |
cleanup |
1106 |
fi |
1107 |
- echo " ${GNAP_PRODUCT} failed, try ${GNAPNAME} -h for more help" |
1108 |
+ echo " ${GNAP_PRODUCT} failed, try ${NAME} -h for more help" |
1109 |
exit 1 |
1110 |
fi |
1111 |
} |
1112 |
|
1113 |
-- |
1114 |
gnap-dev@g.o mailing list |