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 <tu@emlix.com>

diff --git a/templates/local/build-script b/templates/local/build-script
index a314d503658a0ecad1d3a64aaaccba7b38d2a9d9..b7a32db9f28e96b58838c952aedd954f6f571d51 100644 (file)
--- 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 0750b0bb093616daf174bbde9c84b478b1bca264..47d84e1ed43c4dd9c40e8f82208a83bf6ec273b3 100644 (file)
--- 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 = "<result>",
 }

diff --git a/templates/local/source.cvs b/templates/local/source.cvs
index f2ea13330107691a389a90120e9d1f7c87d26ad8..47277e08f115a677f75d753109b5c7a8c7397d73 100644 (file)
--- 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 846cfa1b76830aadcc190965ae8f19cec4515443..01763e6123bf0fec883d11ed64b479e88423f7b4 100644 (file)
--- 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 7e88ef26cfc590716306b8e8d0a428d46924bf30..0eba490b5d027ca691d1433a98b4f8f44a1307b9 100644 (file)
--- 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 a5539e8d36217c8d2c1a7cb2d06f2fba9fbfbad9..5763a8cc35f255030fcb07b5b052dd5c6c758326 100644 (file)
--- 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 2221c458099fe658982ad0315f601f920376b31f..d7a2a50154c733446730ab80f2dccc46c3d7ca07 100644 (file)
--- 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 74480403d586e91f0c4c735613bae45beb751fb9..f86369e642fb854861def9a9cf5aa4d9cd07986c 100644 (file)
--- 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 = "<<name>>",
        release_id = "<<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 dbd189040514ddcbd1bc1ee739948ff37898ee73..9dae9012a97ccd4b5d8390be07a45bd9665f21de 100644 (file)
--- 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 8a7b088470776ab1fabde04bfd10c28cac362ffa..2113d69ed9e3dcaa0d52dcd52b2791b2702bab57 100644 (file)
--- 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 {
 }