summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--configurations.yaml15
-rw-r--r--ex/handset-ia32-mtf-ex.yaml17
-rw-r--r--kickstart/kickstart.tmpl24
-rwxr-xr-x[-rw-r--r--]tools/kickstarter21
4 files changed, 67 insertions, 10 deletions
diff --git a/configurations.yaml b/configurations.yaml
index bfd1631..30936c6 100644
--- a/configurations.yaml
+++ b/configurations.yaml
@@ -1,3 +1,5 @@
+ExternalConfigs:
+ - ex
Default:
Active: True
Language: en_US.UTF-8
@@ -9,6 +11,7 @@ Default:
DefaultUser: meego
DefaultUserPass: meego
PartSize: 1900
+ FileSystem: ext3
PostScripts:
- rpm
Groups:
@@ -29,6 +32,7 @@ N900:
Part: n900
BootloaderTimeout:
BootloaderAppend:
+ StartX: True
Groups:
- MeeGo Core
- Minimal MeeGo X Window System
@@ -52,6 +56,7 @@ MFLD:
BootloaderAppend: "ro pci=noearly console=tty1 console=ttyS0 console=ttyMFD2 earlyprintk=mrst loglevel=8 s0ix_latency=160"
BootloaderTimeout: 2
Bootloader: True
+ StartX: True
Groups:
- MeeGo Core
- Minimal MeeGo X Window System
@@ -77,6 +82,7 @@ IVI:
BootloaderAppend: "quiet"
BootloaderTimeout: 0
Session: "/usr/bin/startivi"
+ StartX: True
Groups:
- X for IVI
Kernel: kernel-adaptation-intel-automotive
@@ -91,6 +97,7 @@ NETBOOK:
Bootloader: True
BootloaderAppend: "quiet"
BootloaderTimeout: 0
+ StartX: True
Groups:
- X for Netbooks
- Virtual Machine Support
@@ -112,6 +119,7 @@ Configurations:
Platform: IVI
Desktop: X-IVI
FileName: ivi-ia32
+ Mic2Options: -f livecd
Groups:
- MeeGo IVI Desktop
- MeeGo Base Development
@@ -128,6 +136,7 @@ Configurations:
Platform: IVI
Desktop: X-IVI
FileName: ivi-ia32
+ Mic2Options: -f livecd
Groups:
- MeeGo IVI Desktop
- MeeGo Base Development
@@ -144,6 +153,7 @@ Configurations:
Platform: NETBOOK
Desktop: meego
FileName: netbook-ia32
+ Mic2Options: -f livecd
Groups:
- MeeGo Netbook Desktop
- Base Double Byte IME Support
@@ -159,6 +169,7 @@ Configurations:
Baseline: "1.1.80"
Platform: N900
FileName: handset-armv7l-n900-devel
+ Mic2Options: -f raw --save-kernel --arch=armv7l
Architecture: armv7l
Desktop: DUI
Session: "/usr/bin/mcompositor"
@@ -178,6 +189,7 @@ Configurations:
Baseline: "1.1.80"
Platform: N900
FileName: handset-armv7l-n900
+ Mic2Options: -f raw --save-kernel --arch=armv7l
Architecture: armv7l
Desktop: DUI
Session: "/usr/bin/mcompositor"
@@ -198,6 +210,7 @@ Configurations:
Baseline: "1.1.80"
Platform: MFLD
FileName: handset-ia32-mtf-devel
+ Mic2Options: -f nand
Kernel: kernel-adaptation-medfield
Architecture: ia32
Desktop: DUI
@@ -214,6 +227,7 @@ Configurations:
Baseline: "1.1.80"
Platform: MFLD
FileName: handset-ia32-pinetrail-mtf
+ Mic2Options: -f livecd
Kernel: kernel
Architecture: ia32
Desktop: DUI
@@ -224,6 +238,7 @@ Configurations:
Baseline: "1.1.80"
Platform: MFLD
FileName: handset-ia32-mtf
+ Mic2Options: -f nand
Kernel: kernel-adaptation-medfield
Architecture: ia32
Desktop: DUI
diff --git a/ex/handset-ia32-mtf-ex.yaml b/ex/handset-ia32-mtf-ex.yaml
new file mode 100644
index 0000000..7ee466b
--- /dev/null
+++ b/ex/handset-ia32-mtf-ex.yaml
@@ -0,0 +1,17 @@
+Name: MeeGo Handset MTF
+Schedule: "* * * * 3"
+Active: True
+Baseline: "1.1.80"
+Platform: MFLD
+FileName: handset-ia32-mtf-ex
+Mic2Options: -f nand
+Kernel: kernel-adaptation-medfield
+Architecture: ia32
+Desktop: DUI
+Session: "/usr/bin/mcompositor"
+Groups:
+ - Moorestown Support
+PostScripts:
+ - kernel-handset
+ - kboot
+ - serial-mfld
diff --git a/kickstart/kickstart.tmpl b/kickstart/kickstart.tmpl
index 2be34d1..83bd1d3 100644
--- a/kickstart/kickstart.tmpl
+++ b/kickstart/kickstart.tmpl
@@ -1,3 +1,7 @@
+#if $metadata.has_key("Mic2Options")
+# -*-mic2-options-*- ${metadata.Mic2Options} -*-mic2-options-*-
+
+#end if
# ##############################################
# Do not Edit! Generated by:
# kickstarter.py
@@ -7,23 +11,28 @@ lang ${metadata.Language}
keyboard ${metadata.Keyboard}
timezone --utc ${metadata.Timezone}
#if $metadata.Part == ""
-part / --size ${metadata.PartSize} --ondisk sda --fstype=ext3
+part / --size ${metadata.PartSize} --ondisk sda --fstype=${metadata.FileSystem}
#else
${metadata.Part}
#end if
rootpw ${metadata.RootPass}
+#if $metadata.has_key("StartX")
xconfig --startxonboot
+#end if
#if $metadata.has_key("Bootloader")
bootloader --timeout=${metadata.BootloaderTimeout} --append="${metadata.BootloaderAppend}"
#end if
#if $metadata.has_key("Desktop")
-desktop --autologinuser=${metadata.DefaultUser} --defaultdesktop=${metadata.Desktop} #slurp
+desktop --autologinuser=${metadata.DefaultUser} #slurp
+#if $metadata.Desktop != "None"
+--defaultdesktop=${metadata.Desktop} #slurp
#end if
#if $metadata.has_key("Session")
--session="${metadata.Session}"
#else
#end if
+#end if
user --name ${metadata.DefaultUser} --groups audio,video --password ${metadata.DefaultUserPass}
#set $save = ""
@@ -33,14 +42,17 @@ user --name ${metadata.DefaultUser} --groups audio,video --password ${metadata.
#for $r in $metadata.Repos
#for $rr in $repos
#if $rr.Name == $r
-repo --name=${r} --baseurl=${rr.Url} ${save}
+#if $rr.Name == "adobe"
+repo --name=${r} --baseurl=${rr.Url} --save
+#else
+repo --name=${r} --baseurl=${rr.Url} ${save}
+#end if
#end if
#end for
#end for
-
-#if $metadata.PackageArgs != ""
-%packages ${metadata.PackageArgs}
+#if $metadata.has_key("PackageArgs")
+%packages --${metadata.PackageArgs}
#else
%packages
#end if
diff --git a/tools/kickstarter b/tools/kickstarter
index 3fc6ab6..225eb61 100644..100755
--- a/tools/kickstarter
+++ b/tools/kickstarter
@@ -54,7 +54,7 @@ class KSWriter():
full = full + plat[l]
if img.has_key(l) and img[l]:
full = full + img[l]
- lvald[l] = set(full)
+ lvald[l] = sorted(set(full), key=full.index)
#print full
conf.update(lvald)
#print conf
@@ -62,14 +62,14 @@ class KSWriter():
for scr in conf['PostScripts']:
f = open('./custom/scripts/%s.post' %scr, 'r')
postscript += f.read()
- postscript += "\n\n"
+ postscript += "\n"
f.close()
nochrootscript = ""
for scr in conf['NoChrootScripts']:
f = open('./custom/scripts/%s.nochroot' %scr, 'r')
nochrootscript += f.read()
- nochrootscript += "\n\n"
+ nochrootscript += "\n"
f.close()
ptab = ""
@@ -93,7 +93,7 @@ class KSWriter():
r = {}
r['Name'] = repo['Name']
r['Url'] = repo['Url'].replace("@ARCH@", meta['Architecture'])
- r['Url'] = repo['Url'].replace("@RELEASE@", meta['Baseline'])
+ r['Url'] = r['Url'].replace("@RELEASE@", meta['Baseline'])
new_repos.append(r)
else:
new_repos = repos
@@ -145,6 +145,14 @@ if __name__ == '__main__':
for img in image_meta['Configurations']:
conf = ks.parse(img)
ks.process_files(conf, r)
+ for path in image_meta['ExternalConfigs']:
+ for f in os.listdir(path):
+ if '.yaml' in f:
+ fp = file('%s/%s' %(path, f), 'r')
+ local = yaml.load(fp)
+ conf = ks.parse(local)
+ ks.process_files(conf, r)
+
if options.indexfile:
"""
<?xml version="1.0"?>
@@ -176,6 +184,11 @@ if __name__ == '__main__':
cc.text = "%s" %img['Name']
s.append(cc)
+ if img.has_key('Architecture'):
+ cc = etree.Element('arch')
+ cc.text = "%s" %img['Architecture']
+ s.append(cc)
+
cc = etree.Element('md5')
cc.text = ""
s.append(cc)
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-24 07:19:06 +0000