diff options
| -rw-r--r-- | Makefile | 5 | ||||
| -rw-r--r-- | demo/configurations.yaml (renamed from configurations.yaml) | 0 | ||||
| -rw-r--r-- | demo/custom/part/custom (renamed from custom/part/custom) | 0 | ||||
| -rw-r--r-- | demo/custom/part/n900 (renamed from custom/part/n900) | 0 | ||||
| -rw-r--r-- | demo/custom/part/n900-devel (renamed from custom/part/n900-devel) | 0 | ||||
| -rw-r--r-- | demo/custom/scripts/buildname.nochroot (renamed from custom/scripts/buildname.nochroot) | 0 | ||||
| -rw-r--r-- | demo/custom/scripts/cleanup.post (renamed from custom/scripts/cleanup.post) | 0 | ||||
| -rw-r--r-- | demo/custom/scripts/flash.post (renamed from custom/scripts/flash.post) | 0 | ||||
| -rw-r--r-- | demo/custom/scripts/fstab-n900.post (renamed from custom/scripts/fstab-n900.post) | 0 | ||||
| -rw-r--r-- | demo/custom/scripts/inittab-n900.post (renamed from custom/scripts/inittab-n900.post) | 0 | ||||
| -rw-r--r-- | demo/custom/scripts/kboot.post (renamed from custom/scripts/kboot.post) | 0 | ||||
| -rw-r--r-- | demo/custom/scripts/kernel-handset.post (renamed from custom/scripts/kernel-handset.post) | 0 | ||||
| -rw-r--r-- | demo/custom/scripts/prelink.post (renamed from custom/scripts/prelink.post) | 0 | ||||
| -rw-r--r-- | demo/custom/scripts/rpm.post (renamed from custom/scripts/rpm.post) | 0 | ||||
| -rw-r--r-- | demo/custom/scripts/serial-mfld.post (renamed from custom/scripts/serial-mfld.post) | 0 | ||||
| -rw-r--r-- | demo/custom/scripts/serial.post (renamed from custom/scripts/serial.post) | 0 | ||||
| -rw-r--r-- | demo/custom/scripts/u-boot.post (renamed from custom/scripts/u-boot.post) | 0 | ||||
| -rw-r--r-- | demo/repos.yaml (renamed from repos.yaml) | 0 | ||||
| -rw-r--r-- | kickstart/kickstart.tmpl | 6 | ||||
| -rwxr-xr-x[-rw-r--r--] | tools/fetch-configs.py | 0 |
20 files changed, 7 insertions, 4 deletions
@@ -17,7 +17,7 @@ TEMPLATE_MODS=$(patsubst %.tmpl,%.py,$(TEMPLATES)) KS=$(wildcard *.ks) all: tmpls - python setup.py build + python setup.py build tmpls: cd kickstart; make @@ -25,7 +25,6 @@ tmpls: %.py: %.tmpl $(CHEETAH) compile --settings='useStackFrames=False' $< - ks: $(TEMPLATES) configurations.yaml repos.yaml kickstarter -c configurations.yaml -r repos.yaml @@ -46,4 +45,4 @@ clean: rm -f $(TEMPLATE_MODS) rm -f $(addsuffix .bak,$(TEMPLATE_MODS)) rm -f *.pyc *.pyo - rm -rf build/ kickstart/kickstart.py kickstart/__init__.py *~ */*~ + rm -rf dist/ build/ kickstart/kickstart.py kickstart/__init__.py *~ */*~ diff --git a/configurations.yaml b/demo/configurations.yaml index 724ebd6..724ebd6 100644 --- a/configurations.yaml +++ b/demo/configurations.yaml diff --git a/custom/part/custom b/demo/custom/part/custom index d6c8b6b..d6c8b6b 100644 --- a/custom/part/custom +++ b/demo/custom/part/custom diff --git a/custom/part/n900 b/demo/custom/part/n900 index bd7ac77..bd7ac77 100644 --- a/custom/part/n900 +++ b/demo/custom/part/n900 diff --git a/custom/part/n900-devel b/demo/custom/part/n900-devel index e239fa8..e239fa8 100644 --- a/custom/part/n900-devel +++ b/demo/custom/part/n900-devel diff --git a/custom/scripts/buildname.nochroot b/demo/custom/scripts/buildname.nochroot index edd20a7..edd20a7 100644 --- a/custom/scripts/buildname.nochroot +++ b/demo/custom/scripts/buildname.nochroot diff --git a/custom/scripts/cleanup.post b/demo/custom/scripts/cleanup.post index c36c2e4..c36c2e4 100644 --- a/custom/scripts/cleanup.post +++ b/demo/custom/scripts/cleanup.post diff --git a/custom/scripts/flash.post b/demo/custom/scripts/flash.post index fe062d3..fe062d3 100644 --- a/custom/scripts/flash.post +++ b/demo/custom/scripts/flash.post diff --git a/custom/scripts/fstab-n900.post b/demo/custom/scripts/fstab-n900.post index 03b6fc1..03b6fc1 100644 --- a/custom/scripts/fstab-n900.post +++ b/demo/custom/scripts/fstab-n900.post diff --git a/custom/scripts/inittab-n900.post b/demo/custom/scripts/inittab-n900.post index 4650a2f..4650a2f 100644 --- a/custom/scripts/inittab-n900.post +++ b/demo/custom/scripts/inittab-n900.post diff --git a/custom/scripts/kboot.post b/demo/custom/scripts/kboot.post index d5d5183..d5d5183 100644 --- a/custom/scripts/kboot.post +++ b/demo/custom/scripts/kboot.post diff --git a/custom/scripts/kernel-handset.post b/demo/custom/scripts/kernel-handset.post index cb07f6c..cb07f6c 100644 --- a/custom/scripts/kernel-handset.post +++ b/demo/custom/scripts/kernel-handset.post diff --git a/custom/scripts/prelink.post b/demo/custom/scripts/prelink.post index 527548c..527548c 100644 --- a/custom/scripts/prelink.post +++ b/demo/custom/scripts/prelink.post diff --git a/custom/scripts/rpm.post b/demo/custom/scripts/rpm.post index 6a07394..6a07394 100644 --- a/custom/scripts/rpm.post +++ b/demo/custom/scripts/rpm.post diff --git a/custom/scripts/serial-mfld.post b/demo/custom/scripts/serial-mfld.post index c3c62b0..c3c62b0 100644 --- a/custom/scripts/serial-mfld.post +++ b/demo/custom/scripts/serial-mfld.post diff --git a/custom/scripts/serial.post b/demo/custom/scripts/serial.post index 5961379..5961379 100644 --- a/custom/scripts/serial.post +++ b/demo/custom/scripts/serial.post diff --git a/custom/scripts/u-boot.post b/demo/custom/scripts/u-boot.post index 6377edc..6377edc 100644 --- a/custom/scripts/u-boot.post +++ b/demo/custom/scripts/u-boot.post diff --git a/repos.yaml b/demo/repos.yaml index 38928c9..38928c9 100644 --- a/repos.yaml +++ b/demo/repos.yaml diff --git a/kickstart/kickstart.tmpl b/kickstart/kickstart.tmpl index 1ac13be..2c0365f 100644 --- a/kickstart/kickstart.tmpl +++ b/kickstart/kickstart.tmpl @@ -57,7 +57,11 @@ user --name ${metadata.DefaultUser} --groups audio,video --password ${metadata. #set $options_repo = $rr.Options #end if #if $rr.Name == "adobe" -repo --name=${r} --baseurl=${rr.Url} --save +#if $rr.has_key("Options") +repo --name=${r} --baseurl=${rr.Url} ${rr.Options} +#else +repo --name=${r} --baseurl=${rr.Url} +#end if #else repo --name=${r} --baseurl=${rr.Url} ${options_repo} #end if diff --git a/tools/fetch-configs.py b/tools/fetch-configs.py index 653af7f..653af7f 100644..100755 --- a/tools/fetch-configs.py +++ b/tools/fetch-configs.py |