From 155142c3234200f7603ef4f5a060b1d1943d2f4e Mon Sep 17 00:00:00 2001 From: Tobias Ulmer Date: Fri, 1 Mar 2013 16:57:27 +0100 Subject: [PATCH] Cleanup templates, fix formating, add modelines Also remove a few lesser used keys, they can be looked up in the manual. Signed-off-by: Tobias Ulmer --- templates/local/build-script | 3 ++ templates/local/result | 8 ++--- templates/local/source.cvs | 10 ++---- templates/local/source.files | 62 +++++++++++++++++------------------- templates/local/source.git | 10 ++---- templates/local/source.svn | 10 ++---- templates/proj/chroot | 35 ++++++++++---------- templates/proj/config | 9 ++++-- templates/proj/env | 3 ++ templates/proj/licences | 3 ++ 10 files changed, 74 insertions(+), 79 deletions(-) diff --git a/templates/local/build-script b/templates/local/build-script index a314d50..b7a32db 100644 --- a/templates/local/build-script +++ b/templates/local/build-script @@ -1,3 +1,6 @@ +# -*- Mode: sh; tab-width: 8 -*- +# vim:ft=sh:sts=0:noet:nosta:ts=8: + # e2factory build script template # # The build system provides the following variables for use in build scripts: diff --git a/templates/local/result b/templates/local/result index 0750b0b..47d84e1 100644 --- a/templates/local/result +++ b/templates/local/result @@ -1,4 +1,5 @@ --- e2factory result configuration template -- +-- -*- Mode: Lua; tab-width: 8 -*- +-- vim:ft=lua:sts=0:noet:nosta:ts=8: e2result { -- a list of sources @@ -7,9 +8,4 @@ e2result { depends = { }, -- a list of chroot groups chroot = { }, - -- an environment dictionary - env = { }, - -- use the collect_project feature for this result? - collect_project = false, - -- collect_project_default_result = "", } diff --git a/templates/local/source.cvs b/templates/local/source.cvs index f2ea133..47277e0 100644 --- a/templates/local/source.cvs +++ b/templates/local/source.cvs @@ -1,15 +1,11 @@ --- e2factory cvs source configuration template -- +-- -*- Mode: Lua; tab-width: 8 -*- +-- vim:ft=lua:sts=0:noet:nosta:ts=8: e2source { - -- the source name - -- (is derived from the config file path if only one source is - -- specified per file) - name = "name", - -- the source type type = "cvs", -- environment env = { - key = "value", + --key = "value", }, -- a list of licences from proj/licences licences={ }, diff --git a/templates/local/source.files b/templates/local/source.files index 846cfa1..01763e6 100644 --- a/templates/local/source.files +++ b/templates/local/source.files @@ -1,36 +1,32 @@ --- e2factory files source configuration template -- +-- -*- Mode: Lua; tab-width: 8 -*- +-- vim:ft=lua:sts=0:noet:nosta:ts=8: e2source { - -- the source name - -- (is derived from the config file path if only one source is specified - -- per file) - name = "name", - -- the source type - type = "files", - -- environment - env = { - key = "value", - }, - -- a list of licences from proj/licences - licences = { }, - -- the server. Files can specify their own one or inherit this one. - server = "upstream", - -- the file list - file = { - -- each file must be configured in a table like this - { - -- server name (or inherit from top-level) - -- server = "upstream", - -- file location relative to the server - location = "h/hello/1.0/hello-1.0.tar.gz", - -- select one of unpack, patch and copy - -- unpacking creates this directory - unpack = "hello-1.0", - -- file is a patch. Apply with patch -p1 - --patch = "1", - -- copy to a directory relative to the source tree - --copy = ".", - }, - -- insert more files here - }, + type = "files", + -- environment + env = { + --key = "value", + }, + -- a list of licences from proj/licences + licences = { }, + -- the server. Files can specify their own one or inherit this one. + server = "upstream", + -- the file list + file = { + -- each file must be configured in a table like this + { + -- server name (or inherit from top-level) + -- server = "upstream", + -- file location relative to the server + location = "h/hello/1.0/hello-1.0.tar.gz", + -- select one of unpack, patch and copy + -- unpacking creates this directory + unpack = "hello-1.0", + -- file is a patch. Apply with patch -p1 + --patch = "1", + -- copy to a directory relative to the source tree + --copy = ".", + }, + -- insert more files here + }, } diff --git a/templates/local/source.git b/templates/local/source.git index 7e88ef2..0eba490 100644 --- a/templates/local/source.git +++ b/templates/local/source.git @@ -1,15 +1,11 @@ --- -*- Lua -*- +-- -*- Mode: Lua; tab-width: 8 -*- +-- vim:ft=lua:sts=0:noet:nosta:ts=8: e2source { - -- the source name - -- (is derived from the config file path if only one source is - -- specified per file) - name = "name", - -- the source type type = "git", -- environment env = { - key = "value", + --key = "value", }, -- a list of licences from proj/licences licences = { }, diff --git a/templates/local/source.svn b/templates/local/source.svn index a5539e8..5763a8c 100644 --- a/templates/local/source.svn +++ b/templates/local/source.svn @@ -1,15 +1,11 @@ --- e2factory subversion source configuration template -- +-- -*- Mode: Lua; tab-width: 8 -*- +-- vim:ft=lua:sts=0:noet:nosta:ts=8: e2source { - -- the source name - -- (is derived from the config file path if only one source is - -- specified per file) - name = "name", - -- the source type type = "svn", -- environment env = { - key = "value", + --key = "value", }, -- a list of licences from proj/licences licences={ }, diff --git a/templates/proj/chroot b/templates/proj/chroot index 2221c45..d7a2a50 100644 --- a/templates/proj/chroot +++ b/templates/proj/chroot @@ -1,19 +1,22 @@ +-- -*- Mode: Lua; tab-width: 8 -*- +-- vim:ft=lua:sts=0:noet:nosta:ts=8: + -- e2factory chroot configuration file -- -local cp = "emlix/chroot-i386/tags/20080916-stable-2/" +local cp = "emlix/chroot-i386/tags/20080916-stable-5/" e2chroot { - default_groups = { - "base", - }, - groups = { - { - name = "base", - server = "chroot", - files = { - { - location = cp.."base.tar.gz", - sha1 = "130584621d77fadff34127be31653c675f7cb582", - } - }, - }, - }, + default_groups = { + "base", + }, + groups = { + { + name = "base", + server = "chroot", + files = { + { + location = cp.."base.tar.gz", + sha1 = "653e4244ee255dd0924296d79a330fd9b350a9b4", + } + }, + }, + }, } diff --git a/templates/proj/config b/templates/proj/config index 7448040..f86369e 100644 --- a/templates/proj/config +++ b/templates/proj/config @@ -1,12 +1,15 @@ +-- -*- Mode: Lua; tab-width: 8 -*- +-- vim:ft=lua:sts=0:noet:nosta:ts=8: + e2project { - -- these must be configured name = "<>", release_id = "<>", + default_results = { }, + deploy_results = { }, - -- these may be configured optionally - --chroot_arch = "x86_32", -- or: x86_64 + chroot_arch = "x86_32", -- or: x86_64 } diff --git a/templates/proj/env b/templates/proj/env index dbd1890..9dae901 100644 --- a/templates/proj/env +++ b/templates/proj/env @@ -1,3 +1,6 @@ +-- -*- Mode: Lua; tab-width: 8 -*- +-- vim:ft=lua:sts=0:noet:nosta:ts=8: + -- e2factory environment configuration file -- env { -- global variables diff --git a/templates/proj/licences b/templates/proj/licences index 8a7b088..2113d69 100644 --- a/templates/proj/licences +++ b/templates/proj/licences @@ -1,3 +1,6 @@ +-- -*- Mode: Lua; tab-width: 8 -*- +-- vim:ft=lua:sts=0:noet:nosta:ts=8: + -- e2factory licence configuration file -- e2licence { } -- 2.39.5