From f6cc34920c032b1a2b0d6a900094135d195931a4 Mon Sep 17 00:00:00 2001 From: JF Ding Date: Wed, 29 Feb 2012 16:39:33 +0800 Subject: [PATCH] no default '--save' for adobe repo --- Makefile | 5 ++--- configurations.yaml => demo/configurations.yaml | 0 {custom => demo/custom}/part/custom | 0 {custom => demo/custom}/part/n900 | 0 {custom => demo/custom}/part/n900-devel | 0 {custom => demo/custom}/scripts/buildname.nochroot | 0 {custom => demo/custom}/scripts/cleanup.post | 0 {custom => demo/custom}/scripts/flash.post | 0 {custom => demo/custom}/scripts/fstab-n900.post | 0 {custom => demo/custom}/scripts/inittab-n900.post | 0 {custom => demo/custom}/scripts/kboot.post | 0 {custom => demo/custom}/scripts/kernel-handset.post | 0 {custom => demo/custom}/scripts/prelink.post | 0 {custom => demo/custom}/scripts/rpm.post | 0 {custom => demo/custom}/scripts/serial-mfld.post | 0 {custom => demo/custom}/scripts/serial.post | 0 {custom => demo/custom}/scripts/u-boot.post | 0 repos.yaml => demo/repos.yaml | 0 kickstart/kickstart.tmpl | 6 +++++- tools/fetch-configs.py | 0 20 files changed, 7 insertions(+), 4 deletions(-) rename configurations.yaml => demo/configurations.yaml (100%) rename {custom => demo/custom}/part/custom (100%) rename {custom => demo/custom}/part/n900 (100%) rename {custom => demo/custom}/part/n900-devel (100%) rename {custom => demo/custom}/scripts/buildname.nochroot (100%) rename {custom => demo/custom}/scripts/cleanup.post (100%) rename {custom => demo/custom}/scripts/flash.post (100%) rename {custom => demo/custom}/scripts/fstab-n900.post (100%) rename {custom => demo/custom}/scripts/inittab-n900.post (100%) rename {custom => demo/custom}/scripts/kboot.post (100%) rename {custom => demo/custom}/scripts/kernel-handset.post (100%) rename {custom => demo/custom}/scripts/prelink.post (100%) rename {custom => demo/custom}/scripts/rpm.post (100%) rename {custom => demo/custom}/scripts/serial-mfld.post (100%) rename {custom => demo/custom}/scripts/serial.post (100%) rename {custom => demo/custom}/scripts/u-boot.post (100%) rename repos.yaml => demo/repos.yaml (100%) mode change 100644 => 100755 tools/fetch-configs.py diff --git a/Makefile b/Makefile index d82ac33..ef0773a 100644 --- a/Makefile +++ b/Makefile @@ -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 similarity index 100% rename from configurations.yaml rename to demo/configurations.yaml diff --git a/custom/part/custom b/demo/custom/part/custom similarity index 100% rename from custom/part/custom rename to demo/custom/part/custom diff --git a/custom/part/n900 b/demo/custom/part/n900 similarity index 100% rename from custom/part/n900 rename to demo/custom/part/n900 diff --git a/custom/part/n900-devel b/demo/custom/part/n900-devel similarity index 100% rename from custom/part/n900-devel rename to demo/custom/part/n900-devel diff --git a/custom/scripts/buildname.nochroot b/demo/custom/scripts/buildname.nochroot similarity index 100% rename from custom/scripts/buildname.nochroot rename to demo/custom/scripts/buildname.nochroot diff --git a/custom/scripts/cleanup.post b/demo/custom/scripts/cleanup.post similarity index 100% rename from custom/scripts/cleanup.post rename to demo/custom/scripts/cleanup.post diff --git a/custom/scripts/flash.post b/demo/custom/scripts/flash.post similarity index 100% rename from custom/scripts/flash.post rename to demo/custom/scripts/flash.post diff --git a/custom/scripts/fstab-n900.post b/demo/custom/scripts/fstab-n900.post similarity index 100% rename from custom/scripts/fstab-n900.post rename to demo/custom/scripts/fstab-n900.post diff --git a/custom/scripts/inittab-n900.post b/demo/custom/scripts/inittab-n900.post similarity index 100% rename from custom/scripts/inittab-n900.post rename to demo/custom/scripts/inittab-n900.post diff --git a/custom/scripts/kboot.post b/demo/custom/scripts/kboot.post similarity index 100% rename from custom/scripts/kboot.post rename to demo/custom/scripts/kboot.post diff --git a/custom/scripts/kernel-handset.post b/demo/custom/scripts/kernel-handset.post similarity index 100% rename from custom/scripts/kernel-handset.post rename to demo/custom/scripts/kernel-handset.post diff --git a/custom/scripts/prelink.post b/demo/custom/scripts/prelink.post similarity index 100% rename from custom/scripts/prelink.post rename to demo/custom/scripts/prelink.post diff --git a/custom/scripts/rpm.post b/demo/custom/scripts/rpm.post similarity index 100% rename from custom/scripts/rpm.post rename to demo/custom/scripts/rpm.post diff --git a/custom/scripts/serial-mfld.post b/demo/custom/scripts/serial-mfld.post similarity index 100% rename from custom/scripts/serial-mfld.post rename to demo/custom/scripts/serial-mfld.post diff --git a/custom/scripts/serial.post b/demo/custom/scripts/serial.post similarity index 100% rename from custom/scripts/serial.post rename to demo/custom/scripts/serial.post diff --git a/custom/scripts/u-boot.post b/demo/custom/scripts/u-boot.post similarity index 100% rename from custom/scripts/u-boot.post rename to demo/custom/scripts/u-boot.post diff --git a/repos.yaml b/demo/repos.yaml similarity index 100% rename from repos.yaml rename to 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 old mode 100644 new mode 100755 -- 2.7.4