Gentoo Archives: gnap-dev

From: codesite-noreply@××××××.com
To: gnap-dev@l.g.o
Subject: [gnap-dev] [gnap-dev commit] r111 - in trunk: src tools
Date: Tue, 17 Jun 2008 19:07:34
Message-Id: 00163646d99b32c11b044fe174be@google.com
1 Author: rieggepp
2 Date: Tue Jun 17 11:56:28 2008
3 New Revision: 111
4
5 Modified:
6 trunk/src/gnap_make
7 trunk/tools/gnap_overlay
8 trunk/tools/gnap_remaster
9
10 Log:
11 Applied 04-gnap-environment.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:56:28 2008
17 @@ -1,7 +1,7 @@
18 #!/bin/bash
19 VERSION='2.0'
20
21 -GNAP_LIBDIR='/usr/lib/gnap'
22 +GNAP_LIBDIR=${GNAP_LIBDIR:-'/usr/lib/gnap'}
23 source ${GNAP_LIBDIR}/gnap_shared.sh
24 echo "GNAP Core Building tool ${NAME} version ${VERSION}"
25
26 @@ -25,65 +25,36 @@
27 exit 0
28 fi
29
30 -gbegin 'Checking parameters'
31 -
32 # Catalyst executable and config file
33 -GNAP_CATALYST_BIN="/usr/bin/catalyst"
34 -GNAP_CATALYST_CONF="/etc/catalyst/catalyst.conf"
35 +GNAP_CATALYST_BIN=${GNAP_CATALYST_BIN:-"/usr/bin/catalyst"}
36 +GNAP_CATALYST_CONF=${GNAP_CATALYST_CONF:-"/etc/catalyst/catalyst.conf"}
37
38 -# Read options
39 -GNAP_STAGE3=0
40 -GNAP_LIVECD1=0
41 -GNAP_LIVECD2=0
42 -GNAP_TARBALL=0
43 -GNAP_MODULES=0
44 -GNAP_STAMP=$(date +%Y%m%d)
45 -NOTARGET=1
46 -NEEDS_SNAPSHOT=0
47 +# Default options
48 +GNAP_STAMP=${GNAP_STAMP:-$(date +%Y%m%d)}
49 +GNAP_STAGE3=${GNAP_STAGE3:-0}
50 +GNAP_LIVECD1=${GNAP_LIVECD1:-0}
51 +GNAP_LIVECD2=${GNAP_LIVECD2:-0}
52 +GNAP_TARBALL=${GNAP_TARBALL:-0}
53 +GNAP_MODULES=${GNAP_MODULES:-0}
54 +
55 +# Read options (phase 1)
56 +gbegin 'Checking parameters'
57 +
58 +OPTIND=0
59 while getopts ':hs:p:m:o:v:t:fl:c:e:' option; do
60 case ${option} in
61 - h )
62 + h )
63 + gtest
64 usage
65 exit 0;;
66 - s ) GNAP_STAGE3FILE="${OPTARG}";;
67 - p ) GNAP_SNAPSHOTFILE="${OPTARG}";;
68 - o ) GNAP_PORTAGE_OVERLAYS="${GNAP_PORTAGE_OVERLAYS} ${OPTARG}";;
69 - v ) GNAP_STAMP="${OPTARG}";;
70 - t )
71 - case "${OPTARG}" in
72 - all )
73 - GNAP_STAGE3=1
74 - GNAP_LIVECD1=1
75 - GNAP_LIVECD2=1
76 - GNAP_TARBALL=1
77 - GNAP_MODULES=1
78 - NEEDS_SNAPSHOT=1;;
79 - stage3 )
80 - GNAP_STAGE3=1
81 - NEEDS_SNAPSHOT=1;;
82 - livecd-stage1 )
83 - GNAP_LIVECD1=1
84 - NEEDS_SNAPSHOT=1;;
85 - livecd-stage2 )
86 - GNAP_LIVECD2=1
87 - NEEDS_SNAPSHOT=1;;
88 - tarball )
89 - GNAP_TARBALL=1;;
90 - extensions )
91 - GNAP_MODULES=1
92 - NEEDS_SNAPSHOT=1;;
93 - * ) gtest 1 'Specified stage is unknown!';;
94 - esac
95 - NOTARGET=0;;
96 - f ) GNAP_FORCEYES=1;;
97 - l ) GNAP_LOGPREFIX="${OPTARG}";;
98 - c ) GNAP_CATALYST_CONF="${OPTARG}";;
99 e ) GNAP_SPECS="${OPTARG}";;
100 + s|p|o|v|t|f|l|c ) :;;
101 * ) gtest 1 'Specified options are incomplete or unknown!';;
102 esac
103 done
104
105 # Root is needed
106 +# * non-root can only use "gnap_make -h"
107 test "${EUID}" -eq 0
108 gtest continued $? "You need to be root to run ${NAME}"
109
110 @@ -113,15 +84,71 @@
111 DISTCCSPEC="distcc_hosts: ${DISTCC_HOSTS}"
112 fi
113
114 +
115 +# Read options (phase 2)
116 +OPTIND=0
117 +while getopts ':hs:p:m:o:v:t:fl:c:e:' option; do
118 + case ${option} in
119 + c ) GNAP_CATALYST_CONF="${OPTARG}";;
120 + s|p|o|v|t|f|l|e|h ) :;;
121 + * ) gtest 1 'Specified options are incomplete or unknown!';;
122 + esac
123 +done
124 +
125 # catalyst.conf file
126 test -f "${GNAP_CATALYST_CONF}"
127 gtest continued $? "${GNAP_CATALYST_CONF} file not found!"
128 source "${GNAP_CATALYST_CONF}"
129
130 +# Read options (phase 3)
131 +OPTIND=0
132 +while getopts ':hs:p:m:o:v:t:fl:c:e:' option; do
133 + case ${option} in
134 + s ) GNAP_STAGE3FILE="${OPTARG}";;
135 + p ) GNAP_SNAPSHOTFILE="${OPTARG}";;
136 + o ) GNAP_PORTAGE_OVERLAYS="${GNAP_PORTAGE_OVERLAYS} ${OPTARG}";;
137 + v ) GNAP_STAMP="${OPTARG}";;
138 + t )
139 + case "${OPTARG}" in
140 + all )
141 + GNAP_STAGE3=1
142 + GNAP_LIVECD1=1
143 + GNAP_LIVECD2=1
144 + GNAP_TARBALL=1
145 + GNAP_MODULES=1;;
146 + stage3 ) GNAP_STAGE3=1;;
147 + livecd-stage1 ) GNAP_LIVECD1=1;;
148 + livecd-stage2 ) GNAP_LIVECD2=1;;
149 + tarball ) GNAP_TARBALL=1;;
150 + extensions ) GNAP_MODULES=1;;
151 + * ) gtest 1 'Specified stage is unknown!';;
152 + esac;;
153 + f ) GNAP_FORCEYES=1;;
154 + l ) GNAP_LOGPREFIX="${OPTARG}";;
155 + c|e|h ) :;;
156 + * ) gtest 1 'Specified options are incomplete or unknown!';;
157 + esac
158 +done
159 +
160 # At least one target is needed
161 -test "${NOTARGET}" -eq 0
162 -gtest continued $? \
163 +test "${GNAP_STAGE3}" -eq 0 &&
164 +test "${GNAP_LIVECD1}" -eq 0 &&
165 +test "${GNAP_LIVECD2}" -eq 0 &&
166 +test "${GNAP_TARBALL}" -eq 0 &&
167 +test "${GNAP_MODULES}" -eq 0
168 +if [[ $? -eq 0 ]]; then
169 + gtest continued 1 \
170 'No target specified. You should provide at least one -t option.'
171 +fi
172 +
173 +NEEDS_SNAPSHOT=0
174 +test "${GNAP_STAGE3}" -eq 1 ||
175 +test "${GNAP_LIVECD1}" -eq 1 ||
176 +test "${GNAP_LIVECD2}" -eq 1 ||
177 +test "${GNAP_MODULES}" -eq 1
178 +if [[ $? -eq 0 ]]; then
179 + NEEDS_SNAPSHOT=1
180 +fi
181
182 # storedir must exist
183 gmkdir "${storedir}"
184
185 Modified: trunk/tools/gnap_overlay
186 ==============================================================================
187 --- trunk/tools/gnap_overlay (original)
188 +++ trunk/tools/gnap_overlay Tue Jun 17 11:56:28 2008
189 @@ -1,7 +1,7 @@
190 #!/bin/bash
191 VERSION='2.0'
192
193 -GNAP_LIBDIR='/usr/lib/gnap'
194 +GNAP_LIBDIR=${GNAP_LIBDIR:-'/usr/lib/gnap'}
195 source ${GNAP_LIBDIR}/gnap_shared.sh
196 echo "GNAP overlay tool ${NAME} ${VERSION}"
197
198 @@ -42,19 +42,14 @@
199 exit 0
200 fi
201
202 -gbegin 'Checking parameters'
203 +# Default settings
204 +GNAP_NOLOGO=${GNAP_NOLOGO:-0}
205 +GNAP_CREATE=${GNAP_CREATE:-'n'}
206 +GNAP_IMG_SIZE=${GNAP_IMG_SIZE:-15}
207
208 # Read options
209 -GNAP_NOLOGO=0
210 -GNAP_FORCEYES=0
211 -GNAP_OUTPUT=''
212 -GNAP_TYPE=''
213 -GNAP_CREATE='n'
214 -GNAP_IMG_SIZE=15
215 -GNAP_TARGETROOT=''
216 -GNAP_CACHE=''
217 -GNAP_SERIAL=''
218 -GNAP_BAUDRATE=''
219 +gbegin 'Checking parameters'
220 +
221 while getopts ':hg:o:c:nfi:d:l:r:ms:S:L:' option; do
222 case ${option} in
223 h ) usage
224
225 Modified: trunk/tools/gnap_remaster
226 ==============================================================================
227 --- trunk/tools/gnap_remaster (original)
228 +++ trunk/tools/gnap_remaster Tue Jun 17 11:56:28 2008
229 @@ -1,12 +1,10 @@
230 #!/bin/bash
231 VERSION='2.0'
232
233 -GNAP_LIBDIR='/usr/lib/gnap'
234 +GNAP_LIBDIR=${GNAP_LIBDIR:-'/usr/lib/gnap'}
235 source ${GNAP_LIBDIR}/gnap_shared.sh
236 echo "GNAP remastering tool ${NAME} ${VERSION}"
237
238 -GNAP_OUTPUT='mygnap-core.tar'
239 -
240 usage() {
241 echo
242 echo 'Usage:'
243 @@ -33,12 +31,8 @@
244 gbegin 'Checking parameters'
245
246 # Read options
247 -GNAP_EXTENSIONS=''
248 -GNAP_KERNEXT=''
249 -GNAP_MODEXT=''
250 -GNAP_BASEFS=''
251 -GNAP_EXTDIR=''
252 -GNAP_FORCEYES=0
253 +GNAP_OUTPUT=${GNAP_OUTPUT:-'mygnap-core.tar'}
254 +
255 while getopts ':he:k:m:o:g:b:d:f' option; do
256 case ${option} in
257 h ) usage
258 --
259 gnap-dev@l.g.o mailing list