From 9cd02622123c8773580ee567b80ebf2f158e6a47 Mon Sep 17 00:00:00 2001
From: Martin Gracik <mgracik@redhat.com>
Date: Fri, 4 Mar 2011 13:27:59 +0100
Subject: [PATCH] Minor sparc pseudo code changes

---
 pseudo/sparc.pseudo.py | 58 ++++++++++++++++++++----------------------
 1 file changed, 28 insertions(+), 30 deletions(-)

diff --git a/pseudo/sparc.pseudo.py b/pseudo/sparc.pseudo.py
index c35ed741..43f9ae7e 100644
--- a/pseudo/sparc.pseudo.py
+++ b/pseudo/sparc.pseudo.py
@@ -25,38 +25,38 @@ IMPLANTISOMD5 = "implantisomd5"
 makedirs(joinpaths(outputroot, IMAGESDIR))
 makedirs(joinpaths(outputroot, SPARCDIR))
 
-# create images
-# copy kernel
-kernel.fname = "vmlinuz"
-kernel.fpath = copy(kernel.fpath,
-                    joinpaths(outputroot, SPARCDIR,  kernel.fname))
-
-# create and copy initrd
-initrd_fname = "initrd.img"
-initrd_fpath = copy(create_initrd(kernel),
-                joinpaths(outputroot, SPARCDIR,  initrd_fname))
-
 # copy silo.conf
 siloconf = copy(joinpaths(installroot, ANABOOTDIR, "silo.conf"),
-                joinpaths(outputroot, SPARCDIR, "silo.conf"))
+                joinpaths(outputroot, SPARCDIR))
 
 # copy boot.msg
 bootmsg = copy(joinpaths(installroot, ANABOOTDIR, "boot.msg"),
-                joinpaths(outputroot, SPARCDIR, "boot.msg"))
+               joinpaths(outputroot, SPARCDIR))
 
 replace(bootmsg, "%PRODUCT%", product)
 replace(bootmsg, "%VERSION%", version)
 
-# add kernel and initrd to .treeinfo
-with open(treeinfo, "a") as f:
-    f.write("[images-%s]\n" % kernel.arch)
-    f.write("kernel = %s\n" % joinpaths(SPARCDIR, kernel.fname))
-    f.write("initrd = %s\n" % joinpaths(SPARCDIR, initrd_fname))
-
 # copy  *.b to sparc dir
 copy(joinpaths(installroot, ANABOOTDIR, "*.b"),
-         joinpaths(outputroot, SPARCDIR))
+     joinpaths(outputroot, SPARCDIR))
 
+# create images
+for kernel in kernellist:
+    # copy kernel
+    kernel.fname = "vmlinuz"
+    kernel.fpath = copy(kernel.fpath,
+                        joinpaths(outputroot, SPARCDIR,  kernel.fname))
+
+    # create and copy initrd
+    initrd_fname = "initrd.img"
+    initrd_fpath = copy(create_initrd(kernel),
+                        joinpaths(outputroot, SPARCDIR,  initrd_fname))
+
+    # add kernel and initrd to .treeinfo
+    with open(treeinfo, "a") as f:
+        f.write("[images-%s]\n" % kernel.arch)
+        f.write("kernel = %s\n" % joinpaths(SPARCDIR, kernel.fname))
+        f.write("initrd = %s\n" % joinpaths(SPARCDIR, initrd_fname))
 
 if (bootiso):
     # create isopath dir
@@ -68,19 +68,17 @@ if (bootiso):
 
     # create boot.iso
     bootiso_fpath = joinpaths(outputroot, IMAGESDIR, bootiso)
-    boot_path = joinpaths(outputroot, SPARCDIR)
-    
-    # run mkisofs
+
+    # run mkisofs (XXX what's with the "Fedora" exclude?)
     rc = exec([MKISOFS, "-R", "-J", "-T",
-               "-G", "/boot/isofs.b",
+               "-G", "/%s" % joinpaths(SPARCDIR, "isofs.b"),
                "-B",  "...",
-               "-s",  "/boot/silo.conf", 
-               "-r", "-V", "PBOOT", "-A", '"%s %s"' % (product, version),
-               "-x", "Fedora",
-               "-x", "repodata",
-               "-sparc-label", '"%s %s Boot Disc"' % (product, version), 
+               "-s",  "/%s" % joinpaths(SPARCDIR, "silo.conf"),
+               "-r", "-V", '"PBOOT"', "-A", '"%s %s"' % (product, version),
+               "-x", "Fedora", "-x", "repodata",
+               "-sparc-label", '"%s %s Boot Disc"' % (product, version),
                "-o", bootiso_fpath, "-graft-points",
-               "boot=%s" % boot_path])
+               "boot=%s" % joinpaths(outputroot, SPARCDIR)])
 
     # run implantisomd5
     rc = exec([IMPLANTISOMD5, bootiso_fpath])