phase1: move config.seed into config.ini

Signed-off-by: Jo-Philipp Wich <jo@mein.io>

diff --git a/phase1/config.ini.example b/phase1/config.ini.example
index 3c7baf153db24d6d442213011abb2efca387763e..fda7baed046fbd8ed35220ce34521b3392bbf637 100644 (file)
--- a/phase1/config.ini.example
+++ b/phase1/config.ini.example
@@ -13,7 +13,12 @@ git_ssh_key = -----BEGIN RSA PRIVATE KEY-----
        mHzkh8Uv4OAWTjiLGycbXa0/31hu9PCeNzYmjjrp8tcGjsiJJFxydgS+wc0i2UPV
        nSI+JbmAAF9vw6gj2i+Hqx7UloRd0tEv/leX354T5lO06LMiNhvN9g==
        -----END RSA PRIVATE KEY-----
-
+config_seed = # Seed configuration
+       CONFIG_BUILDBOT=y
+       CONFIG_DEVEL=y
+       CONFIG_CCACHE=n
+       CONFIG_KERNEL_KALLSYMS=y
+       CONFIG_AUTOREMOVE=y
 
 [status]
 bind = tcp:8010:interface=127.0.0.1

diff --git a/phase1/config.seed.example b/phase1/config.seed.example
deleted file mode 100644 (file)
index 4570eb9..0000000
--- a/phase1/config.seed.example
+++ /dev/null
@@ -1,5 +0,0 @@
-CONFIG_BUILDBOT=y
-CONFIG_DEVEL=y
-CONFIG_CCACHE=n
-CONFIG_KERNEL_KALLSYMS=y
-CONFIG_AUTOREMOVE=y

diff --git a/phase1/master.cfg b/phase1/master.cfg
index e4674b2679d130cd00ca76f8ec3934e525635ef9..5350a433d32d75b83dd6f43eeff23a99eaa77cec 100644 (file)
--- a/phase1/master.cfg
+++ b/phase1/master.cfg
@@ -103,6 +103,8 @@ cc_version = None
 cc_command = "gcc"
 cxx_command = "g++"
 
+config_seed = ""
+
 git_ssh = False
 git_ssh_key = None
 
@@ -125,6 +127,9 @@ if ini.has_option("general", "git_ssh_key"):
 else:
        git_ssh = False
 
+if ini.has_option("general", "config_seed"):
+       config_seed = ini.get("general", "config_seed")
+
 repo_url = ini.get("repo", "url")
 repo_branch = "master"
 
@@ -693,12 +698,13 @@ for target in targets:
        ))
 
        # seed config
-       factory.addStep(FileDownload(
-               name = "dlconfigseed",
-               mastersrc = "config.seed",
-               slavedest = ".config",
-               mode = 0644
-       ))
+       if config_seed is not None:
+               factory.addStep(StringDownload(
+                       name = "dlconfigseed",
+                       s = config_seed + '\n',
+                       slavedest = ".config",
+                       mode = 0644
+               ))
 
        # configure
        factory.addStep(ShellCommand(