diff options
| -rw-r--r-- | configurations.yaml | 12 | ||||
| -rw-r--r-- | kickstart/kickstart.tmpl | 23 | ||||
| -rwxr-xr-x[-rw-r--r--] | tools/kickstarter | 4 |
3 files changed, 32 insertions, 7 deletions
diff --git a/configurations.yaml b/configurations.yaml index bfd1631..13bb538 100644 --- a/configurations.yaml +++ b/configurations.yaml @@ -29,6 +29,7 @@ N900: Part: n900 BootloaderTimeout: BootloaderAppend: + StartX: True Groups: - MeeGo Core - Minimal MeeGo X Window System @@ -52,6 +53,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 +79,7 @@ IVI: BootloaderAppend: "quiet" BootloaderTimeout: 0 Session: "/usr/bin/startivi" + StartX: True Groups: - X for IVI Kernel: kernel-adaptation-intel-automotive @@ -91,6 +94,7 @@ NETBOOK: Bootloader: True BootloaderAppend: "quiet" BootloaderTimeout: 0 + StartX: True Groups: - X for Netbooks - Virtual Machine Support @@ -112,6 +116,7 @@ Configurations: Platform: IVI Desktop: X-IVI FileName: ivi-ia32 + Mic2Options: -f livecd Groups: - MeeGo IVI Desktop - MeeGo Base Development @@ -128,6 +133,7 @@ Configurations: Platform: IVI Desktop: X-IVI FileName: ivi-ia32 + Mic2Options: -f livecd Groups: - MeeGo IVI Desktop - MeeGo Base Development @@ -144,6 +150,7 @@ Configurations: Platform: NETBOOK Desktop: meego FileName: netbook-ia32 + Mic2Options: -f livecd Groups: - MeeGo Netbook Desktop - Base Double Byte IME Support @@ -159,6 +166,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 +186,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 +207,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 +224,7 @@ Configurations: Baseline: "1.1.80" Platform: MFLD FileName: handset-ia32-pinetrail-mtf + Mic2Options: -f livecd Kernel: kernel Architecture: ia32 Desktop: DUI @@ -224,6 +235,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/kickstart/kickstart.tmpl b/kickstart/kickstart.tmpl index 2be34d1..b0a7025 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 @@ -6,24 +10,30 @@ lang ${metadata.Language} keyboard ${metadata.Keyboard} timezone --utc ${metadata.Timezone} +auth --useshadow --enablemd5 #if $metadata.Part == "" part / --size ${metadata.PartSize} --ondisk sda --fstype=ext3 #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 +43,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..9b3cdbe 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 @@ -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 |