From cedcc32d0cd5ae050e059fc6a41f6c9436665ed8 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Sun, 30 Jun 2019 20:28:57 +0200 Subject: [PATCH] phase1: move config.seed into config.ini Signed-off-by: Jo-Philipp Wich --- phase1/config.ini.example | 7 ++++++- phase1/config.seed.example | 5 ----- phase1/master.cfg | 18 ++++++++++++------ 3 files changed, 18 insertions(+), 12 deletions(-) delete mode 100644 phase1/config.seed.example diff --git a/phase1/config.ini.example b/phase1/config.ini.example index 3c7baf1..fda7bae 100644 --- 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 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 e4674b2..5350a43 100644 --- 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( -- 2.30.2