another taroon merge. tagged before as before-taroon-merge, after as

after-taroon-merge

this one adds s390 fixes, basic i/p series platform support, support for
multiple kernels and one second stage, cmdline kickstart mode (nice for s390),
some warning cleanups.

1 files changed, 11 insertions, 1 deletions

diff --git a/comps.py b/comps.py
index 120b5cddf..4b172ed56 100644
--- a/comps.py
+++ b/comps.py
@@ -201,6 +201,14 @@ class HeaderList:
         self.hasFullHeaders = 0
 	for h in hdlist:
 	    name = h[rpm.RPMTAG_NAME]
+
+            # we should only keep kernel-pseries and kernel-iseries on
+            # the appropriate machine
+            if name == "kernel-pseries" and iutil.getPPCMachine() != "pSeries":
+                continue
+            if name == "kernel-iseries" and iutil.getPPCMachine() != "iSeries":
+                continue
+            
             if noscore:
                 self.packages[name] = Package(h)
                 continue
@@ -990,7 +998,9 @@ class ComponentSet:
 	for (ktag, nick) in [ ('kernel-summit', 'summit'),
                               ('kernel-bigmem', 'bigmem'),
 			      ('kernel-smp', 'smp'),
-			      ('kernel-tape', 'tape') ]:
+			      ('kernel-tape', 'tape'),
+                              ('kernel-pseries', ''),
+                              ('kernel-iseries', '') ]:
 	    tag = split(ktag, '-')[1]
 	    if (self.packages.has_key(ktag) and 
 		self.packages[ktag].selected):