Gentoo Archives: gnap-dev

From: codesite-noreply@××××××.com
To: gnap-dev@l.g.o
Subject: [gnap-dev] [gnap-dev commit] r109 - in trunk: src tools
Date: Tue, 17 Jun 2008 18:59:33
Message-Id: 00163646b9f083a7a3044fe157e6@google.com
1 Author: rieggepp
2 Date: Tue Jun 17 11:55:23 2008
3 New Revision: 109
4
5 Modified:
6 trunk/src/gnap_make
7 trunk/tools/gnap_overlay
8 trunk/tools/gnap_remaster
9
10 Log:
11 Applied 02-gnap-split.patch from Summer of Code 2007.
12
13 Modified: trunk/src/gnap_make
14 ==============================================================================
15 --- trunk/src/gnap_make (original)
16 +++ trunk/src/gnap_make Tue Jun 17 11:55:23 2008
17 @@ -1,78 +1,9 @@
18 #!/bin/bash
19 GNAPVERSION='2.0'
20
21 -GNAPNAME=$(basename "$0")
22 -echo "GNAP Core Building tool ${GNAPNAME} version ${GNAPVERSION}"
23 GNAPLIBDIR='/usr/lib/gnap'
24 -STAGE3FILE="${GNAPLIBDIR}/gnap-stage3seed.tar.bz2"
25 -SNAPSHOTFILE="${GNAPLIBDIR}/gnap-portagesnapshot.tar.bz2"
26 -SPECS="${GNAPLIBDIR}/gnap-specs.tar.bz2"
27 -TEMPDIR=''
28 -
29 -G=$'\e[32;01m'
30 -B=$'\e[31;01m'
31 -N=$'\e[0m'
32 -W=$'\e[33;01m'
33 -K=$'\e[34;01m'
34 -C="$[$(set -- $(stty size 2>/dev/null); echo ${2}) - 7]"
35 -E=$'\e['${C}'G'
36 -
37 -gwarn() {
38 - echo -e " ${W}*${N} ${*}"
39 -}
40 -
41 -ginfo() {
42 - echo -e " ${G}*${N} ${*}"
43 -}
44 -
45 -gmkdir() {
46 - mkdir -p "$1"
47 - gtest continued $? "Failed to create directory \"$1\"."
48 -}
49 -
50 -gconfirm() {
51 - if [[ "${FORCEYES}" -eq 1 ]]; then
52 - gwarn "${*} forced to yes"
53 - else
54 - read -ep " ${W}*${N} ${*} [N]: " answer
55 - if [[ "${answer}" != 'y' && "${answer}" != 'Y' ]]; then
56 - if [[ -n "${TEMPDIR}" ]]; then
57 - cleanup
58 - fi
59 - echo Build aborted!
60 - exit 2
61 - fi
62 - fi
63 -}
64 -
65 -gbegin() {
66 - echo -ne " ${G}*${N} ${*}..."
67 -}
68 -
69 -gtest() {
70 - continued=0
71 - if [[ "$#" -gt 0 && "${1}" == 'continued' ]]; then
72 - shift
73 - continued=1
74 - fi
75 - if [[ "$#" -eq 0 || "${1}" -eq 0 ]]; then
76 - if [[ "${continued}" -eq 0 ]]; then
77 - echo -e "${E} ${K}[ ${G}ok${K} ]${N}"
78 - fi
79 - else
80 - echo -e "${E} ${K}[ ${B}!!${K} ]${N}"
81 - if [[ "$#" -ge 2 ]]; then
82 - shift
83 - echo -en " ${B}*${N} ${*}"
84 - echo -e "${E} ${K}[ ${B}!!${K} ]${N}"
85 - fi
86 - if [[ -n "${TEMPDIR}" ]]; then
87 - cleanup
88 - fi
89 - echo "Build failed, try man ${GNAPNAME} for more help"
90 - exit 1
91 - fi
92 -}
93 +source ${GNAPLIBDIR}/gnap_shared.sh
94 +echo "GNAP Core Building tool ${GNAPNAME} version ${GNAPVERSION}"
95
96 usage() {
97 echo 'Options:'
98 @@ -89,18 +20,6 @@
99 echo "Please use man ${GNAPNAME} for more details."
100 }
101
102 -cleanup() {
103 - gbegin 'Cleaning temporary directories'
104 - if [[ -d "${TEMPDIR}" ]]; then
105 - DIRTOREMOVE="${TEMPDIR}"
106 - TEMPDIR=''
107 - rm -rf "${DIRTOREMOVE}"
108 - gtest $? "Failed to remove ${DIRTOREMOVE}"
109 - else
110 - gtest 0
111 - fi
112 -}
113 -
114 if [[ "$#" -eq 0 ]]; then
115 usage
116 exit 0
117 @@ -109,7 +28,7 @@
118 gbegin 'Checking parameters'
119
120 # Catalyst executable and config file
121 -CATALYST_BIN="/usr/bin/catayst"
122 +CATALYST_BIN="/usr/bin/catalyst"
123 CATALYST_CONF="/etc/catalyst/catalyst.conf"
124
125 # Read options
126 @@ -250,7 +169,7 @@
127 ginfo "${TARGETLIST}"
128
129 # Confirm tarball overwrite if TARBALL stage selected
130 -if [[ "${TARBALL}" -eq 1 -a -e "gnap-${GNAPVERSION}-${STAMP}.tar" ]]; then
131 +if [[ "${TARBALL}" -eq 1 && -e "gnap-${GNAPVERSION}-${STAMP}.tar" ]]; then
132 gconfirm "gnap-${GNAPVERSION}-${STAMP}.tar already exists, overwrite"
133 fi
134
135
136 Modified: trunk/tools/gnap_overlay
137 ==============================================================================
138 --- trunk/tools/gnap_overlay (original)
139 +++ trunk/tools/gnap_overlay Tue Jun 17 11:55:23 2008
140 @@ -1,79 +1,11 @@
141 #!/bin/bash
142 VERSION='2.0'
143
144 -GNAPNAME=$(basename "$0")
145 -echo "GNAP overlay tool ${GNAPNAME} ${VERSION}"
146 GNAPLIBDIR='/usr/lib/gnap'
147 -GNAPCORE="${GNAPLIBDIR}/gnap-core.tar"
148 -GNAPMBR="${GNAPLIBDIR}/mbr/mbr.bin"
149 -TEMPDIR=''
150 -IMG_SIZE=15
151 -
152 -G=$'\e[32;01m'
153 -B=$'\e[31;01m'
154 -N=$'\e[0m'
155 -W=$'\e[33;01m'
156 -K=$'\e[34;01m'
157 -C="$[$(set -- $(stty size 2>/dev/null); echo ${2}) - 7]"
158 -E=$'\e['${C}'G'
159 -
160 -gwarn() {
161 - echo -e " ${W}*${N} ${*}"
162 -}
163 -
164 -ginfo() {
165 - echo -e " ${G}*${N} ${*}"
166 -}
167 -
168 -gmkdir() {
169 - mkdir -p "$1"
170 - gtest continued $? "Failed to create directory \"$1\"."
171 -}
172 -
173 -gconfirm() {
174 - if [[ "${FORCEYES}" -eq 1 ]]; then
175 - gwarn "${*} forced to yes"
176 - else
177 - read -ep " ${W}*${N} ${*} [N]: " answer
178 - if [[ "${answer}" != 'y' && "${answer}" != 'Y' ]]; then
179 - if [[ -n "${TEMPDIR}" || -n "${LOOP}" ]]; then
180 - cleanup
181 - fi
182 - echo 'Overlay aborted!'
183 - exit 2
184 - fi
185 - fi
186 -}
187 -
188 -gbegin() {
189 - echo -ne " ${G}*${N} ${*}..."
190 -}
191 +source ${GNAPLIBDIR}/gnap_shared.sh
192 +echo "GNAP overlay tool ${GNAPNAME} ${VERSION}"
193
194 -gtest() {
195 - continued=0
196 - if [[ "$#" -gt 0 && "${1}" == 'continued' ]]; then
197 - shift
198 - continued=1
199 - fi
200 -
201 - if [[ "${#}" -eq 0 || "${1}" -eq 0 ]]; then
202 - if [[ "${continued}" -eq 0 ]]; then
203 - echo -e "${E} ${K}[ ${G}ok${K} ]${N}"
204 - fi
205 - else
206 - echo -e "${E} ${K}[ ${B}!!${K} ]${N}"
207 - if [[ "$#" -ge 2 ]]; then
208 - shift
209 - echo -en " ${B}*${N} ${*}"
210 - echo -e "${E} ${K}[ ${B}!!${K} ]${N}"
211 - fi
212 - if [[ -n "${TEMPDIR}" || -n "${LOOP}" ]]; then
213 - cleanup
214 - fi
215 - echo "Overlay failed, try ${GNAPNAME} -h for more help"
216 - exit 1
217 - fi
218 -}
219 +IMG_SIZE=15
220
221 usage() {
222 echo
223 @@ -107,23 +39,6 @@
224 echo "Please use man ${GNAPNAME} for more details."
225 }
226
227 -cleanup() {
228 - if [[ -n "${LOOP}" ]]; then
229 - gbegin 'Unmounting loop filesystem'
230 - umount "${LOOP}" && losetup -d "${LOOP}"
231 - gtest $? "Failed to unmount ${LOOP}"
232 - fi
233 - gbegin 'Cleaning temporary directories'
234 - if [[ -d "${TEMPDIR}" ]]; then
235 - DIRTOREMOVE="${TEMPDIR}"
236 - TEMPDIR=''
237 - rm -rf "${DIRTOREMOVE}"
238 - gtest $? "Failed to remove ${DIRTOREMOVE}"
239 - else
240 - gtest 0
241 - fi
242 -}
243 -
244 if [[ "$#" -eq 0 || "${1}" == '-h' ]]; then
245 usage
246 exit 0
247 @@ -226,7 +141,7 @@
248
249 if [[ -n "${BAUDRATE}" ]]; then
250 gbegin 'Adding baudrate for serial console'
251 - gmkdir "${TEMPOVERDIR}/etc/gnap"
252 + gmkdir -p "${TEMPOVERDIR}/etc/gnap"
253 echo -n "${BAUDRATE}" > "${TEMPOVERDIR}/etc/gnap/baudrate"
254 gtest $? 'Failed to create /etc/gnap/baudrate'
255 fi
256
257 Modified: trunk/tools/gnap_remaster
258 ==============================================================================
259 --- trunk/tools/gnap_remaster (original)
260 +++ trunk/tools/gnap_remaster Tue Jun 17 11:55:23 2008
261 @@ -1,76 +1,11 @@
262 #!/bin/bash
263 VERSION='2.0'
264
265 -GNAPNAME=$(basename "$0")
266 -echo "GNAP remastering tool ${GNAPNAME} ${VERSION}"
267 GNAPLIBDIR='/usr/lib/gnap'
268 -GNAPEXTDIR="${GNAPLIBDIR}/extensions"
269 -TEMPDIR=''
270 -GNAPCORE="${GNAPLIBDIR}/gnap-core.tar"
271 -GNAPBASEFS="${GNAPLIBDIR}/gnap-basefs.tar.bz2"
272 -OUTPUT='mygnap-core.tar'
273 -
274 -G=$'\e[32;01m'
275 -B=$'\e[31;01m'
276 -N=$'\e[0m'
277 -W=$'\e[33;01m'
278 -K=$'\e[34;01m'
279 -C="$[$(set -- $(stty size 2>/dev/null); echo ${2}) - 7]"
280 -E=$'\e['${C}'G'
281 -
282 -gwarn() {
283 - echo -e " ${W}*${N} ${*}"
284 -}
285 -
286 -gmkdir() {
287 - mkdir -p "$1"
288 - gtest continued $? "Failed to create directory \"$1\"."
289 -}
290 -
291 -gconfirm() {
292 - if [[ "${FORCEYES}" -eq 1 ]]; then
293 - gwarn "${*} forced to yes"
294 - else
295 - read -ep " ${W}*${N} ${*} [N]: " answer
296 - if [[ "${answer}" != 'y' && "${answer}" != 'Y' ]]; then
297 - if [[ -n "${TEMPDIR}" ]]; then
298 - cleanup
299 - fi
300 - echo 'Remaster aborted!'
301 - exit 2
302 - fi
303 - fi
304 -}
305 -
306 -gbegin() {
307 - echo -ne " ${G}*${N} ${*}..."
308 -}
309 -
310 -gtest() {
311 - continued=0
312 - if [[ "$#" -gt 0 && "${1}" == 'continued' ]]; then
313 - shift
314 - continued=1
315 - fi
316 +source ${GNAPLIBDIR}/gnap_shared.sh
317 +echo "GNAP remastering tool ${GNAPNAME} ${VERSION}"
318
319 - if [[ "${#}" -eq 0 || "${1}" -eq 0 ]]; then
320 - if [[ "${continued}" -eq 0 ]]; then
321 - echo -e "${E} ${K}[ ${G}ok${K} ]${N}"
322 - fi
323 - else
324 - echo -e "${E} ${K}[ ${B}!!${K} ]${N}"
325 - if [[ "$#" -ge 2 ]]; then
326 - shift
327 - echo -en " ${B}*${N} ${*}"
328 - echo -e "${E} ${K}[ ${B}!!${K} ]${N}"
329 - fi
330 - if [[ -n "${TEMPDIR}" ]]; then
331 - cleanup
332 - fi
333 - echo "Remaster failed, try ${GNAPNAME} -h for more help"
334 - exit 1
335 - fi
336 -}
337 +OUTPUT='mygnap-core.tar'
338
339 usage() {
340 echo
341 @@ -88,18 +23,6 @@
342 echo ' -f Force all answers to yes (dangerous!)'
343 echo
344 echo "Please use man ${GNAPNAME} for more details."
345 -}
346 -
347 -cleanup() {
348 - gbegin 'Cleaning temporary directories'
349 - if [[ -d "${TEMPDIR}" ]]; then
350 - DIRTOREMOVE="${TEMPDIR}"
351 - TEMPDIR=''
352 - rm -rf "${DIRTOREMOVE}"
353 - gtest $? "Failed to remove ${DIRTOREMOVE}"
354 - else
355 - gtest 0
356 - fi
357 }
358
359 if [[ "$#" -eq 0 || "${1}" == '-h' ]]; then
360 --
361 gnap-dev@l.g.o mailing list