1 |
I've rebased the commit, removing the whitespace changes in COPYING as |
2 |
Matt suggested. |
3 |
|
4 |
This commit is suitable for current master as well. It should apply |
5 |
cleanly. |
6 |
|
7 |
================================================ |
8 |
|
9 |
diff --git a/ChangeLog b/ChangeLog |
10 |
index 893cfec..12b41f2 100644 |
11 |
@@ -1798,7 +1798,7 @@ |
12 |
Removed famd from the default runlevel for gentoo-release-livecd. It really |
13 |
shouldn't cause a problem, but I prefer it stay a bit clean. |
14 |
|
15 |
- 11 Jul 2006; Chris Gianelloni <wolf31o2@g.o> |
16 |
+ 11 Jul 2006; Chris Gianelloni <wolf31o2@g.o> |
17 |
modules/generic_stage_target.py, targets/support/bootloader-setup.sh, |
18 |
targets/support/create-iso.sh, targets/support/kmerge.sh, |
19 |
targets/support/livecdfs-update.sh, targets/support/mips-arcload_conf.sh: |
20 |
@@ -2432,7 +2432,7 @@ |
21 |
10 Jan 2006; Eric Edgar <rocket@g.o> |
22 |
modules/generic_stage_target.py, targets/support/kmerge.sh: |
23 |
filter kname - and . for kmerge.sh |
24 |
- |
25 |
+ |
26 |
10 Jan 2006; Chris Gianelloni <wolf31o2@g.o> |
27 |
targets/support/create-iso.sh: |
28 |
Added sparc64 to sparc lines for create-iso.sh to fix ISO creation on sparc64. |
29 |
@@ -3437,7 +3437,7 @@ |
30 |
|
31 |
06 Jul 2005; Eric Edgar <rocket@g.o> targets/support/create-iso.sh: |
32 |
Fix iso creation script. Case statement out of place |
33 |
- |
34 |
+ |
35 |
05 Jul 2005; Chris Gianelloni <wolf31o2@g.o> arch/alpha.py, |
36 |
arch/amd64.py, arch/hppa.py, arch/ia64.py, arch/mips.py, arch/ppc.py, |
37 |
arch/ppc64.py, arch/s390.py, arch/sparc.py, arch/sparc64.py, arch/x86.py, |
38 |
@@ -4762,10 +4762,10 @@ |
39 |
fixes for bugs #55192 and #54137 |
40 |
added a new key for all specfiles, portage_confdir. |
41 |
this should point to a directory similar in functionality to /etc/portage. |
42 |
- |
43 |
+ |
44 |
cleaned up the module code a bit so that unnecessary modules |
45 |
are not imported. |
46 |
- |
47 |
+ |
48 |
more work on resuming. it is getting there, but it still needs a ton of work, |
49 |
so please test, and report bugs. |
50 |
|
51 |
@@ -4790,7 +4790,7 @@ |
52 |
of me doing this is that SIGINT (ctrl-c) makes catalyst die nice and proper |
53 |
now. Additionally, catalyst will stop when there is an error with an ebuild |
54 |
... it didn't do this before, it just plowed along and packed things up. |
55 |
- |
56 |
+ |
57 |
Much thanks to <carpaski@g.o> for (writing) pointing me to the spawn() |
58 |
code in portage.py and then answering my noob questions. |
59 |
|
60 |
@@ -4974,7 +4974,7 @@ |
61 |
05 Apr 2004; John Davis <zhen@g.o> modules/targets.py: |
62 |
bugfix for #46861 |
63 |
|
64 |
- 04 Apr 2004; Benjamin Judas <beejay@g.o> |
65 |
+ 04 Apr 2004; Benjamin Judas <beejay@g.o> |
66 |
livecd/kconfig/config-2004.1-gentoo-dev-sources-2.6.3-r1, |
67 |
livecd/kconfig/config-2004.1-xfs-sources-2.4.24-r3: |
68 |
Added the two kernel-configs for 2004.1 x86 |
69 |
@@ -5052,8 +5052,8 @@ |
70 |
examples/livecd/runscript/alpha-archscript.sh, files/catalyst.conf: |
71 |
fixes for bugs 43676, 43701. Alpha support added as well. |
72 |
|
73 |
- 25 Feb 2004; Pieter Van den Abeele <pvdabeel@g.o>: |
74 |
- added powerpc livecd support, preparing for 2004.0 release. Preliminary |
75 |
+ 25 Feb 2004; Pieter Van den Abeele <pvdabeel@g.o>: |
76 |
+ added powerpc livecd support, preparing for 2004.0 release. Preliminary |
77 |
kde/gnome cd specs added. |
78 |
|
79 |
18 Feb 2004; John Davis <zhen@g.o> files/catalyst.conf: |
80 |
@@ -5070,7 +5070,7 @@ |
81 |
point to a file to use in place of /etc/catalyst.conf. By setting this |
82 |
variable in your shell, catalyst can easily be used by multiple people on the |
83 |
same machine. Also, ccache support now works for genkernel. |
84 |
- |
85 |
+ |
86 |
11 Feb 2004; Daniel Robbins <drobbins@g.o>: |
87 |
removed file for livecd-stage2 target, as this is handled by the runscript |
88 |
now. Added support for "/boot/kernel/foo/use", "/boot/kernel/foo/packages," |
89 |
@@ -5097,34 +5097,34 @@ |
90 |
|
91 |
29 Nov 2003; Daniel Robbins <drobbins@g.o>: |
92 |
Tinderbox target added. See tinderbox examples in examples/ dir. |
93 |
- |
94 |
+ |
95 |
08 Nov 2003; Daniel Robbins <drobbins@g.o>: |
96 |
spec file support integrated into catalyst. Use "-f/--file specfile" as |
97 |
argument; see examples dir for examples. |
98 |
"grp" target now functional. See examples/x86-grp-20031102.spec for an |
99 |
example of how to use it. |
100 |
- |
101 |
+ |
102 |
08 Nov 2003; Daniel Robbins <drobbins@g.o>: |
103 |
support functions for spec file parsing and reading added. Will get added to |
104 |
the code soon. |
105 |
- |
106 |
+ |
107 |
05 Nov 2003; Daniel Robbins <drobbins@g.o>: |
108 |
Many bug fixes later, things seem to be working well for stage1/2/3 so I've |
109 |
added a README. |
110 |
- |
111 |
+ |
112 |
28 Oct 2003; Daniel Robbins <drobbins@g.o>: |
113 |
Significant rework of code structure. Everything is falling nicely into place. |
114 |
- |
115 |
+ |
116 |
28 Oct 2003; Daniel Robbins <drobbins@g.o>: |
117 |
Exception handling fully-integrated into current prototype code. |
118 |
- |
119 |
+ |
120 |
27 Oct 2003; Daniel Robbins <drobbins@g.o>: |
121 |
beginning of exception handling integration, got some of the target code |
122 |
nicely fleshed out. |
123 |
- |
124 |
+ |
125 |
24 Oct 2003; Daniel Robbins <drobbins@g.o>: |
126 |
major code rework in progress on the python parts. |
127 |
- |
128 |
+ |
129 |
17 Oct 2003; John Davis <zhen@g.o> files/grp/x86/x86.conf, |
130 |
files/grp/x86/x86.pkg.cd1, files/grp/x86/x86.pkg.cd2, files/grp/x86/x86.src, |
131 |
files/livecd/x86-basic/base.pkg, files/livecd/x86-basic/kern.pkg: |
132 |
@@ -5146,7 +5146,7 @@ |
133 |
|
134 |
12 Oct 2003; Daniel Robbins <drobins@g.o>: |
135 |
subarch test outsourced to python catalyst-subarches function. |
136 |
- |
137 |
+ |
138 |
12 Oct 2003; John Davis <zhen@g.o> include/build_functions.sh: |
139 |
fixed the entry in include/build_functions.sh for location of bootstrap.sh |
140 |
|
141 |
@@ -5159,7 +5159,7 @@ |
142 |
12 Oct 2003; Robin H. Johnson <robbat2@g.o> catalyst: |
143 |
Fix valid subarch test. |
144 |
|
145 |
- 12 Oct 2003; John Davis <zhen@g.o> catalyst, |
146 |
+ 12 Oct 2003; John Davis <zhen@g.o> catalyst, |
147 |
include/build_functions.sh, include/functions.sh: |
148 |
thanks to robbat2, the cmdline argument handling is now fixed. I moved |
149 |
start_build to build_functions.sh cleaning up the main catalyst script some |
150 |
@@ -5183,7 +5183,7 @@ |
151 |
08 Oct 2003; John Davis <zhen@g.o> catalyst: |
152 |
I changed the is_special handling so that it is cleaner and faster |
153 |
|
154 |
- 08 Oct 2003; John Davis <zhen@g.o> catalyst, include/functions.sh, |
155 |
+ 08 Oct 2003; John Davis <zhen@g.o> catalyst, include/functions.sh, |
156 |
livecd/foundations/x86-basic/base.pkg, livecd/foundations/x86-basic/kern.pkg, |
157 |
livecd/foundations/x86-basic/post-clean.sh, |
158 |
livecd/foundations/x86-basic/pre-clean.sh, |
159 |
@@ -5231,7 +5231,7 @@ |
160 |
stage*-arch-etdyn-ssp.* re method's request. This will not be the first time |
161 |
I change naming conventions, as catalyst will be eventually extended to |
162 |
do selinux-* stages also. |
163 |
- |
164 |
+ |
165 |
Additionally, I updated README.catalyst to include profile information. |
166 |
|
167 |
10 Sep 2003; John Davis <zhen@g.o> README.catalyst, README.stager, |
168 |
diff --git a/arch/alpha.py b/arch/alpha.py |
169 |
index 3fd9b3d..f0fc95a 100644 |
170 |
@@ -71,5 +71,5 @@ def register(): |
171 |
"Inform main catalyst program of the contents of this plugin." |
172 |
return ({ "alpha":arch_alpha, "ev4":arch_ev4, "ev45":arch_ev45, |
173 |
"ev5":arch_ev5, "ev56":arch_ev56, "pca56":arch_pca56, |
174 |
- "ev6":arch_ev6, "ev67":arch_ev67 }, |
175 |
+ "ev6":arch_ev6, "ev67":arch_ev67 }, |
176 |
("alpha", )) |
177 |
diff --git a/arch/arm.py b/arch/arm.py |
178 |
index 4ba5a83..2de3942 100644 |
179 |
@@ -8,7 +8,7 @@ class generic_arm(builder.generic): |
180 |
builder.generic.__init__(self,myspec) |
181 |
self.settings["CHROOT"]="chroot" |
182 |
self.settings["CFLAGS"]="-O2 -pipe" |
183 |
- |
184 |
+ |
185 |
class generic_armeb(builder.generic): |
186 |
"Abstract base class for all arm (big endian) builders" |
187 |
def __init__(self,myspec): |
188 |
@@ -129,5 +129,5 @@ def register(): |
189 |
"armv7a_hardfp" : arch_armv7a_hardfp, |
190 |
"armeb" : arch_armeb, |
191 |
"armv5teb" : arch_armv5teb |
192 |
- }, ("arm", "armv4l", "armv4tl", "armv5tl", "armv5tel", "armv5tejl", "armv6l", |
193 |
+ }, ("arm", "armv4l", "armv4tl", "armv5tl", "armv5tel", "armv5tejl", "armv6l", |
194 |
"armv7l", "armeb", "armv5teb") ) |
195 |
diff --git a/arch/mips.py b/arch/mips.py |
196 |
index 9ea2d0e..b3730fa 100644 |
197 |
@@ -398,7 +398,7 @@ class arch_cobalt_n32(generic_mips64el): |
198 |
|
199 |
def register(): |
200 |
"Inform main catalyst program of the contents of this plugin." |
201 |
- return ({ |
202 |
+ return ({ |
203 |
"cobalt" : arch_cobalt, |
204 |
"cobalt_n32" : arch_cobalt_n32, |
205 |
"mips" : arch_mips1, |
206 |
diff --git a/arch/x86.py b/arch/x86.py |
207 |
index 9d1acb3..0391b79 100644 |
208 |
@@ -55,7 +55,7 @@ class arch_pentium_mmx(generic_x86): |
209 |
generic_x86.__init__(self,myspec) |
210 |
self.settings["CFLAGS"]="-O2 -march=pentium-mmx -pipe" |
211 |
self.settings["HOSTUSE"]=["mmx"] |
212 |
- |
213 |
+ |
214 |
class arch_pentium2(generic_x86): |
215 |
"Intel Pentium 2 CPU with MMX support" |
216 |
def __init__(self,myspec): |
217 |
diff --git a/catalyst b/catalyst |
218 |
index 9f8dd30..c29c814 100755 |
219 |
@@ -66,7 +66,7 @@ def parse_config(myconfig): |
220 |
"portdir":"/usr/portage","options":"",\ |
221 |
"snapshot_cache":"/var/tmp/catalyst/snapshot_cache",\ |
222 |
"hash_function":"crc32"} |
223 |
- |
224 |
+ |
225 |
# first, try the one passed (presumably from the cmdline) |
226 |
if myconfig: |
227 |
if os.path.exists(myconfig): |
228 |
@@ -77,12 +77,12 @@ def parse_config(myconfig): |
229 |
print "!!! catalyst: Could not use specified configuration file "+\ |
230 |
myconfig |
231 |
sys.exit(1) |
232 |
- |
233 |
+ |
234 |
# next, try the default location |
235 |
elif os.path.exists("/etc/catalyst/catalyst.conf"): |
236 |
print "Using default Catalyst configuration file, /etc/catalyst/catalyst.conf" |
237 |
config_file="/etc/catalyst/catalyst.conf" |
238 |
- |
239 |
+ |
240 |
# can't find a config file (we are screwed), so bail out |
241 |
else: |
242 |
print "!!! catalyst: Could not find a suitable configuration file" |
243 |
@@ -93,11 +93,11 @@ def parse_config(myconfig): |
244 |
# execfile(config_file, myconf, myconf) |
245 |
myconfig = catalyst.config.ConfigParser(config_file) |
246 |
myconf.update(myconfig.get_values()) |
247 |
- |
248 |
+ |
249 |
except: |
250 |
print "!!! catalyst: Unable to parse configuration file, "+myconfig |
251 |
sys.exit(1) |
252 |
- |
253 |
+ |
254 |
# now, load up the values into conf_values so that we can use them |
255 |
for x in confdefaults.keys(): |
256 |
if x in myconf: |
257 |
@@ -216,9 +216,9 @@ def build_target(addlargs, targetmap): |
258 |
try: |
259 |
if addlargs["target"] not in targetmap: |
260 |
raise CatalystError,"Target \""+addlargs["target"]+"\" not available." |
261 |
- |
262 |
+ |
263 |
mytarget=targetmap[addlargs["target"]](conf_values, addlargs) |
264 |
- |
265 |
+ |
266 |
mytarget.run() |
267 |
|
268 |
except: |
269 |
@@ -228,7 +228,7 @@ def build_target(addlargs, targetmap): |
270 |
|
271 |
if __name__ == "__main__": |
272 |
targetmap={} |
273 |
- |
274 |
+ |
275 |
version() |
276 |
if os.getuid() != 0: |
277 |
# catalyst cannot be run as a normal user due to chroots, mounts, etc |
278 |
@@ -244,11 +244,11 @@ if __name__ == "__main__": |
279 |
try: |
280 |
opts,args = getopt.getopt(sys.argv[1:], "apPThvdc:C:f:FVs:", ["purge", "purgeonly", "purgetmponly", "help", "version", "debug",\ |
281 |
"clear-autoresume", "config=", "cli=", "file=", "fetch", "verbose","snapshot="]) |
282 |
- |
283 |
+ |
284 |
except getopt.GetoptError: |
285 |
usage() |
286 |
sys.exit(2) |
287 |
- |
288 |
+ |
289 |
# defaults for commandline opts |
290 |
debug=False |
291 |
verbose=False |
292 |
@@ -269,7 +269,7 @@ if __name__ == "__main__": |
293 |
if o in ("-h", "--help"): |
294 |
usage() |
295 |
sys.exit(1) |
296 |
- |
297 |
+ |
298 |
if o in ("-V", "--version"): |
299 |
print "Catalyst version "+__version__ |
300 |
sys.exit(1) |
301 |
@@ -287,14 +287,14 @@ if __name__ == "__main__": |
302 |
while x < len(sys.argv): |
303 |
mycmdline.append(sys.argv[x]) |
304 |
x=x+1 |
305 |
- |
306 |
+ |
307 |
if o in ("-f", "--file"): |
308 |
run = True |
309 |
myspecfile=a |
310 |
|
311 |
if o in ("-F", "--fetchonly"): |
312 |
conf_values["FETCH"]="1" |
313 |
- |
314 |
+ |
315 |
if o in ("-v", "--verbose"): |
316 |
conf_values["VERBOSE"]="1" |
317 |
|
318 |
@@ -307,7 +307,7 @@ if __name__ == "__main__": |
319 |
run = True |
320 |
mycmdline.append("target=snapshot") |
321 |
mycmdline.append("version_stamp="+a) |
322 |
- |
323 |
+ |
324 |
if o in ("-p", "--purge"): |
325 |
conf_values["PURGE"] = "1" |
326 |
|
327 |
@@ -329,7 +329,7 @@ if __name__ == "__main__": |
328 |
parse_config(myconfig) |
329 |
sys.path.append(conf_values["sharedir"]+"/modules") |
330 |
from catalyst_support import * |
331 |
- |
332 |
+ |
333 |
# Start checking that digests are valid now that the hash_map was imported |
334 |
# from catalyst_support |
335 |
if "digests" in conf_values: |
336 |
@@ -373,11 +373,11 @@ if __name__ == "__main__": |
337 |
targetmap=import_modules() |
338 |
|
339 |
addlargs={} |
340 |
- |
341 |
+ |
342 |
if myspecfile: |
343 |
spec = catalyst.config.SpecParser(myspecfile) |
344 |
addlargs.update(spec.get_values()) |
345 |
- |
346 |
+ |
347 |
if mycmdline: |
348 |
try: |
349 |
cmdline = catalyst.config.ConfigParser() |
350 |
@@ -393,7 +393,7 @@ if __name__ == "__main__": |
351 |
# everything is setup, so the build is a go |
352 |
try: |
353 |
build_target(addlargs, targetmap) |
354 |
- |
355 |
+ |
356 |
except CatalystError: |
357 |
print |
358 |
print "Catalyst aborting...." |
359 |
diff --git a/examples/generic_stage_template.spec b/examples/generic_stage_template.spec |
360 |
index b386c7c..45268ca 100644 |
361 |
@@ -12,7 +12,7 @@ subarch: |
362 |
# it to be, but it is usually a date. |
363 |
# example: |
364 |
# version_stamp: 2006.1 |
365 |
-version_stamp: |
366 |
+version_stamp: |
367 |
|
368 |
# The target specifies what target we want catalyst to do. For stages, the |
369 |
# supported targets are: stage1 stage2 stage3 |
370 |
@@ -45,7 +45,7 @@ snapshot: |
371 |
# default/stage3-x86-2006.1 |
372 |
source_subpath: |
373 |
|
374 |
-# These are the hosts used as distcc slaves when distcc is enabled in your |
375 |
+# These are the hosts used as distcc slaves when distcc is enabled in your |
376 |
# catalyst.conf. It follows the same syntax as distcc-config --set-hosts and |
377 |
# is entirely optional. |
378 |
# example: |
379 |
diff --git a/examples/grp_template.spec b/examples/grp_template.spec |
380 |
index 97e49dc..8cf9e27 100644 |
381 |
@@ -17,7 +17,7 @@ version_stamp: |
382 |
# supported targets are: grp |
383 |
# example: |
384 |
# target: grp |
385 |
-target: grp |
386 |
+target: grp |
387 |
|
388 |
# The rel_type defines what kind of build we are doing. This is merely another |
389 |
# identifier, but it useful for allowing multiple concurrent builds. Usually, |
390 |
diff --git a/examples/livecd-stage2_template.spec b/examples/livecd-stage2_template.spec |
391 |
index 18a06a4..1e27918 100644 |
392 |
@@ -110,7 +110,7 @@ livecd/cdtar: |
393 |
livecd/iso: |
394 |
|
395 |
# A fsscript is simply a shell script that is copied into the chroot of the CD |
396 |
-# after the kernel(s) and any external modules have been compiled and is |
397 |
+# after the kernel(s) and any external modules have been compiled and is |
398 |
# executed within the chroot. It can contain any commands that are available |
399 |
# via the packages installed by our stages or by the packages installed during |
400 |
# the livecd-stage1 build. We do not use one for the official release media, so |
401 |
@@ -204,7 +204,7 @@ livecd/rcdel: |
402 |
|
403 |
# This overlay is dropped onto the CD filesystem and is outside any loop which |
404 |
# has been configured. This is typically used for adding the documentation, |
405 |
-# distfiles, snapshots, and stages to the official media. These files will not |
406 |
+# distfiles, snapshots, and stages to the official media. These files will not |
407 |
# be available if docache is enabled, as they are outside the loop. |
408 |
# example: |
409 |
# livecd/overlay: /tmp/overlay-minimal |
410 |
@@ -323,7 +323,7 @@ boot/kernel/gentoo/machine_type: |
411 |
# This is only supported on ppc64 currently. This entry sets up the console= |
412 |
# boot parameters required for sending the output to the appropriate console. |
413 |
# example: |
414 |
-# boot/kernel/gentoo/console: hvsi0 |
415 |
+# boot/kernel/gentoo/console: hvsi0 |
416 |
# boot/kernel/gentoo/console: hvc0 |
417 |
# boot/kernel/gentoo/console: tty0 ttyS0 |
418 |
boot/kernel/gentoo/console: |
419 |
diff --git a/examples/stage4_template.spec b/examples/stage4_template.spec |
420 |
index 9da5e5e..33fc0e6 100644 |
421 |
@@ -66,7 +66,7 @@ portage_overlay: |
422 |
# catalyst. Mainly used as a way for different spec files to access the same |
423 |
# cache directory. Default behavior is for this location to be autogenerated |
424 |
# by catalyst based on the spec file. |
425 |
-# example: |
426 |
+# example: |
427 |
# pkgcache_path: /tmp/packages |
428 |
pkgcache_path: |
429 |
|
430 |
@@ -80,7 +80,7 @@ kerncache_path: |
431 |
|
432 |
# The stage4 target is where you will build packages for basically updated |
433 |
# stage3. These packages can be built with customized USE settings. The |
434 |
-# settings here are additive to the default USE configured by the profile. |
435 |
+# settings here are additive to the default USE configured by the profile. |
436 |
# Leaving this blank will default to the system use flags |
437 |
# example: |
438 |
# stage4/use: ipv6 socks5 fbcon ncurses readline ssl |
439 |
@@ -95,7 +95,7 @@ stage4/use: |
440 |
stage4/packages: |
441 |
|
442 |
# A fsscript is simply a shell script that is copied into the chroot of the stage4 |
443 |
-# after the kernel(s) and any external modules have been compiled and is |
444 |
+# after the kernel(s) and any external modules have been compiled and is |
445 |
# executed within the chroot. It can contain any commands that are available |
446 |
# via the packages installed by our stages or by the packages installed during |
447 |
# the stage4-stage1 build. We do not use one for the official release media, so |
448 |
@@ -126,7 +126,7 @@ stage4/gk_mainargs: |
449 |
# stage4/linuxrc: |
450 |
stage4/linuxrc: |
451 |
|
452 |
-# This is for the message of the day. It is not required |
453 |
+# This is for the message of the day. It is not required |
454 |
# release media, as catalyst builds a default motd when the stage4/type is set |
455 |
# to one of the gentoo-* options. This setting overrides the default motd even |
456 |
# on official media. Since we do not use this for the official releases, it is |
457 |
diff --git a/examples/tinderbox_template.spec b/examples/tinderbox_template.spec |
458 |
index 65ccbe3..09cc20f 100644 |
459 |
@@ -15,7 +15,7 @@ version_stamp: |
460 |
# The target specifies what target we want catalyst to do. |
461 |
# example: |
462 |
# target: tinderbox |
463 |
-target: tinderbox |
464 |
+target: tinderbox |
465 |
|
466 |
# The rel_type defines what kind of build we are doing. This is merely another |
467 |
# identifier, but it useful for allowing multiple concurrent builds. Usually, |
468 |
diff --git a/files/catalyst.conf b/files/catalyst.conf |
469 |
index f88f105..b74c546 100644 |
470 |
@@ -34,7 +34,7 @@ distdir="/usr/portage/distfiles" |
471 |
# export FOO="bar" |
472 |
envscript="/etc/catalyst/catalystrc" |
473 |
|
474 |
-# Internal hash function catalyst should use for things like autoresume, |
475 |
+# Internal hash function catalyst should use for things like autoresume, |
476 |
# seedcache, etc. The default and fastest is crc32. You should not ever need |
477 |
# to change this unless your OS does not support it. |
478 |
# Supported hashes: |
479 |
diff --git a/livecd/files/minimal.motd.txt b/livecd/files/minimal.motd.txt |
480 |
index 1f702fc..55f6158 100644 |
481 |
@@ -2,7 +2,7 @@ The latest version of the Handbook is always available from the Gentoo web |
482 |
site by typing "links http://www.gentoo.org/doc/en/handbook/handbook.xml". |
483 |
|
484 |
To start an ssh server on this system, type "/etc/init.d/sshd start". If you |
485 |
-need to log in remotely as root, type "passwd root" to reset root's password |
486 |
+need to log in remotely as root, type "passwd root" to reset root's password |
487 |
to a known value. |
488 |
|
489 |
Please report any bugs you find to http://bugs.gentoo.org. Be sure to include |
490 |
diff --git a/targets/stage1/build.py b/targets/stage1/build.py |
491 |
index 539c4c7..bf20bcf 100644 |
492 |
@@ -12,7 +12,7 @@ def scan_profile(file): |
493 |
else: |
494 |
if "grab_multiple" in dir(portage): |
495 |
return portage.stack_lists( portage.grab_multiple(file, portage.settings.profiles, portage.grabfile), incremental=1); |
496 |
- else: |
497 |
+ else: |
498 |
return portage.stack_lists( [portage.grabfile_package(os.path.join(x, file)) for x in portage.settings.profiles], incremental=1); |
499 |
|
500 |
# loaded the stacked packages / packages.build files |