resolved conflict

5 files changed, 34 insertions, 27 deletions

diff --git a/Makefile b/Makefile
index 237e327..a4da77f 100644
--- a/Makefile
+++ b/Makefile
@@ -50,3 +50,4 @@ clean:
 	rm -f $(addsuffix .bak,$(TEMPLATE_MODS))
 	rm -f *.pyc *.pyo
 	rm -rf dist/ build/ kickstart/kickstart.py kickstart/__init__.py *~ */*~
+	rm -rf *.egg-info/
diff --git a/demo/configurations.yaml b/demo/configurations.yaml
index 71cee5d..b7d91ed 100644
--- a/demo/configurations.yaml
+++ b/demo/configurations.yaml
@@ -1,7 +1,9 @@
 ExternalConfigs: 
-    - ex
+    - netbook
+
 Default:
     Active: True
+    Baseline: tizen-0.99
     Language: en_US.UTF-8
     Keyboard: us
     PackageArgs:
@@ -116,7 +118,6 @@ NETBOOK:
 Configurations:
     -   Name: MeeGo IVI Development
         Active: True
-        Baseline: "1.1.80"
         Platform: IVI
         Desktop: X-IVI
         FileName: ivi-ia32
@@ -133,7 +134,6 @@ Configurations:
             - mesa-libEGL
     -   Name: MeeGo IVI
         Active: True
-        Baseline: "1.1.80"
         Platform: IVI
         Desktop: X-IVI
         FileName: ivi-ia32
@@ -147,27 +147,9 @@ Configurations:
             - ivi
         ExtraPackages:
             - mesa-libEGL
-    -   Name: MeeGo Netbook/Nettop
-        PartSize: 3000
-        Active: True
-        Baseline: "1.1.80"
-        Platform: NETBOOK
-        Desktop: meego
-        FileName: netbook-ia32
-        Mic2Options: -f livecd
-        Groups:
-            - MeeGo Netbook Desktop
-            - Base Double Byte IME Support
-            - MeeGo Base Development
-        Repos:
-            - core
-            - netbook
-        ExtraPackages:
-            - chromium
     -   Name: MeeGo Handset N900 Development
         Part: n900-devel
         Active: True
-        Baseline: "1.1.80"
         Platform: N900
         FileName: handset-armv7l-n900-devel
         Mic2Options: -f raw --save-kernel --arch=armv7l
@@ -187,7 +169,6 @@ Configurations:
             - u-boot
     -   Name: MeeGo Handset N900
         Active: True
-        Baseline: "1.1.80"
         Platform: N900
         FileName: handset-armv7l-n900
         Mic2Options: -f raw --save-kernel --arch=armv7l
@@ -208,7 +189,6 @@ Configurations:
     -   Name: MeeGo Handset MTF Development
         PartSize: 2200
         Active: True
-        Baseline: "1.1.80"
         Platform: MFLD
         FileName: handset-ia32-mtf-devel
         Mic2Options: -f nand
@@ -225,7 +205,6 @@ Configurations:
             - serial-mfld
     -   Name: MeeGo Handset MTF Pinetrail
         Active: True
-        Baseline: "1.1.80"
         Platform: MFLD
         FileName: handset-ia32-pinetrail-mtf
         Mic2Options: -f livecd
@@ -236,7 +215,6 @@ Configurations:
     -   Name: MeeGo Handset MTF
         Schedule: "* * * * 3"
         Active: True
-        Baseline: "1.1.80"
         Platform: MFLD
         FileName: handset-ia32-mtf
         Mic2Options: -f nand
@@ -252,3 +230,6 @@ Configurations:
             - serial-mfld
         PrePackages:
             - Answer2theUltimateQuestionOfEverything
+        Attachment:
+            - ifwi
+            - /boot/vmlinuz-*
diff --git a/demo/netbook/meego-netbook.yaml b/demo/netbook/meego-netbook.yaml
new file mode 100644
index 0000000..2c1e16a
--- /dev/null
+++ b/demo/netbook/meego-netbook.yaml
@@ -0,0 +1,17 @@
+Name: MeeGo Netbook/Nettop
+PartSize: 2580
+Active: True
+Baseline: "1.1.80"
+Platform: NETBOOK
+Desktop: meego
+FileName: netbook-ia32
+Mic2Options: -f livecd
+Groups:
+    - MeeGo Netbook Desktop
+    - Base Double Byte IME Support
+    - MeeGo Base Development
+Repos:
+    - core
+    - netbook
+ExtraPackages:
+    - chromium
diff --git a/kickstart/kickstart.tmpl b/kickstart/kickstart.tmpl
index 2bed6aa..2cfb83c 100644
--- a/kickstart/kickstart.tmpl
+++ b/kickstart/kickstart.tmpl
@@ -99,6 +99,14 @@ ${e}
 %end
 #end if
 
+#if $metadata.has_key("Attachment")
+%attachment
+#for $e in $metadata.Attachment
+${e}
+#end for
+%end
+#end if
+
 %post
 ${metadata.Post}
 %end
diff --git a/kswriter/KSWriter.py b/kswriter/KSWriter.py
index 54d2021..eaee98d 100644
--- a/kswriter/KSWriter.py
+++ b/kswriter/KSWriter.py
@@ -20,7 +20,7 @@ class KSWriter():
     def __init__(self, configs=None, repos=None, outdir=".", config=None, packages=False):
         self.dist = None
         self.arch = None
-        self.image_filename = configs
+        self.image_filename = os.path.abspath(os.path.expanduser(configs))
         self.repo_filename = repos
         self.outdir = outdir
         self.packages = packages
@@ -141,7 +141,7 @@ class KSWriter():
                         print "%s is inactive, not generating %s at this time" %(img['Name'], img['FileName'] )
         for path in self.image_meta['ExternalConfigs']:
             external_config_dir = os.path.join(os.path.dirname(self.image_filename), path)
-            
+
             for f in os.listdir(external_config_dir):
                 if f.endswith('.yaml'):
                     fp = file('%s/%s' %(external_config_dir, f), 'r')