remove unused defaults for project setup from the code, move defaults from

e2.conf.in to make.vars

Signed-off-by: Gordon Hecker <gh@emlix.com>

diff --git a/generic/e2lib.lua b/generic/e2lib.lua
index aecc5202feaa088898c9a4e29daced7cdb0f595a..7b7848d5bc6fda2b79e1b494cb53359b9642bf61 100644 (file)
--- a/generic/e2lib.lua
+++ b/generic/e2lib.lua
@@ -76,12 +76,6 @@ e2lib = {
   enable_invocation_log = false,
   default_projects_server = "projects",
   default_project_version = "2",
-  -- where to fetch e2 in e2-install-e2
-  default_e2 = {
-    local_branch = "master",
-    local_tag = "^",
-    local_syntax = buildconfig.SYNTAX[1],
-  },
   local_e2_branch = nil,
   local_e2_tag = nil,
   --- command line arguments that influence global settings are stored here

diff --git a/global/e2-create-project.lua.in b/global/e2-create-project.lua.in
index 0e10a7c3f11c89d66d88c9e49d641fc86b625d5b..cea7188630566174fbb98a0b51eee97abab9ab03 100755 (executable)
--- a/global/e2-create-project.lua.in
+++ b/global/e2-create-project.lua.in
@@ -183,7 +183,7 @@ local name = string.format("%s\n", p.name)
 local release_id = string.format("%s\n", p.name) -- use the name for now
 local version = string.format("%s\n", p.version)
 local e2version = string.format("%s\n", p.e2version)
-local syntax = string.format("%s\n", e2lib.default_e2.local_syntax)
+local syntax = string.format("%s\n", buildconfig.SYNTAX[1])
 local empty = ""
 files = {
        { filename = ".e2/.keep", content=empty },

diff --git a/global/e2.conf.in b/global/e2.conf.in
index 97bb40a976797f19af36142d6854a77054dd3e6b..8dc095784d0e81e8e09b6621ae52b83ae8146b69 100644 (file)
--- a/global/e2.conf.in
+++ b/global/e2.conf.in
@@ -8,8 +8,8 @@ config {
                e2_server = "projects",
                e2_location = "e2factory.git",
                e2_base = ".",
-               e2_branch = "e2factory-2.3",
-               e2_tag = "e2factory-2.3.0",
+               e2_branch = "@DEFAULT_LOCAL_BRANCH@",
+               e2_tag = "@DEFAULT_LOCAL_TAG@",
                default_extensions = {
                },
        },

diff --git a/make.vars b/make.vars
index 67359e11c2631ed3d69337d390a3d0828aa2fe53..f8ff4f8440d8996178a0aafb0cefa10673e39c1b 100644 (file)
--- a/make.vars
+++ b/make.vars
@@ -23,6 +23,11 @@ endif
 # list the latest one first
 SYNTAX = 2_3_0 2_2_0
 
+# when creating a project a current set of local tools is requested
+DEFAULT_LOCAL_BRANCH = master
+DEFAULT_LOCAL_TAG = $(TAG)
+export DEFAULT_LOCAL_BRANCH DEFAULT_LOCAL_TAG
+
 DETECT_TOOL = $(TOPLEVEL)/scripts/detect_tool
 
 PROJECTDIR ?= $(shell cd $(TOPLEVEL);scripts/e2-locate-project-root 2>/dev/null)

diff --git a/scripts/genscript.sh b/scripts/genscript.sh
index 84cb74082462dbca25075221f3acb3acea146a9a..43a0bafe187d138f8721d00cc88561a2152b9852 100755 (executable)
--- a/scripts/genscript.sh
+++ b/scripts/genscript.sh
@@ -23,6 +23,8 @@ test -n "$CHROOT_TOOL" || die "CHROOT_TOOL not set"
 test -n "$TAR_TOOL" || die "TAR_TOOL not set"
 test -n "$CHOWN_TOOL" || die "CHOWN_TOOL not set"
 test -n "$RM_TOOL" || die "RM_TOOL not set"
+test -n "$DEFAULT_LOCAL_BRANCH" || die "DEFAULT_LOCAL_BRANCH not set"
+test -n "$DEFAULT_LOCAL_TAG" || die "DEFAULT_LOCAL_TAG not set"
 sed -e s,"@E2_E2DATA@","$E2DATA",g \
     -e s,"@LIBDIR@","$LIBDIR",g \
     -e s,"@LIBEXECDIR@","$LIBEXECDIR",g \
@@ -41,4 +43,6 @@ sed -e s,"@E2_E2DATA@","$E2DATA",g \
     -e s,"@TAR_TOOL@","$TAR_TOOL",g \
     -e s,"@CHOWN_TOOL@","$CHOWN_TOOL",g \
     -e s,"@RM_TOOL@","$RM_TOOL",g \
+    -e s,"@DEFAULT_LOCAL_BRANCH@","$DEFAULT_LOCAL_BRANCH",g \
+    -e s,"@DEFAULT_LOCAL_TAG@","$DEFAULT_LOCAL_TAG",g \
     -e s,"@E2_PREFIX@","$PREFIX",g $1 >$2 \