more fixes, enhancements

diff --git a/configurations.yaml b/configurations.yaml
index 0e42a01..21027e6 100644 (file)
--- a/configurations.yaml
+++ b/configurations.yaml
@@ -26,7 +26,7 @@ CORE:
     NoChrootScripts:
         - buildname
 N900:
     NoChrootScripts:
         - buildname
 N900:

-    PartSize: 1700
+    Part: n900

     BootloaderTimeout: 
     BootloaderAppend: 
     Groups:
     BootloaderTimeout: 
     BootloaderAppend: 
     Groups:


@@ -39,11 +39,10 @@ N900:
         - MeeGo Base Development
     Kernel: kernel-adaptation-n900
     PostScripts:
         - MeeGo Base Development
     Kernel: kernel-adaptation-n900
     PostScripts:

-        - prelink

         - cleanup
     NoChrootScripts:
         - buildname
         - cleanup
     NoChrootScripts:
         - buildname

-    Architecture: ia32
+    Architecture: armv7l

     Repos:
         - core
         - handset
     Repos:
         - core
         - handset

diff --git a/kickstarter.py b/kickstarter.py
index 81c9ab9..6cd4baf 100644 (file)
--- a/kickstarter.py
+++ b/kickstarter.py
@@ -71,10 +71,11 @@ class KSWriter():
             f.close()
 
         ptab = ""
             f.close()
 
         ptab = ""

-        if img.has_key("Part"):
-            f = open("./custom/part/%s" %img['Part'] )
-            ptab = f.read()
-            f.close()  
+       for g in [ plat, img ]:
+           if g.has_key("Part"):
+               f = open("./custom/part/%s" %g['Part'] )
+               ptab = f.read()
+               f.close()  

             
         conf['Part'] = ptab
         conf['Post'] = postscript
             
         conf['Part'] = ptab
         conf['Post'] = postscript