phase1: move initial .config into external file

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

diff --git a/phase1/config.seed.example b/phase1/config.seed.example
new file mode 100644 (file)
index 0000000..cdfe3dc
--- /dev/null
+++ b/phase1/config.seed.example
@@ -0,0 +1,13 @@
+CONFIG_ALL_NONSHARED=y
+CONFIG_SDK=y
+CONFIG_IB=y
+# CONFIG_IB_STANDALONE is not set
+CONFIG_DEVEL=y
+CONFIG_CCACHE=y
+CONFIG_SIGNED_PACKAGES=y
+# CONFIG_PER_FEED_REPO_ADD_COMMENTED is not set
+CONFIG_KERNEL_KALLSYMS=y
+CONFIG_COLLECT_KERNEL_DEBUG=y
+CONFIG_TARGET_ALL_PROFILES=y
+CONFIG_TARGET_MULTI_PROFILE=y
+CONFIG_TARGET_PER_DEVICE_ROOTFS=y

diff --git a/phase1/master.cfg b/phase1/master.cfg
index 2103a59cfc74c781ad39cebdc2060556456aadad..296e9fba63aaf8e95fde7551536701a5854c864e 100644 (file)
--- a/phase1/master.cfg
+++ b/phase1/master.cfg
@@ -300,27 +300,19 @@ for target in targets:
                description = "Installing feeds",
                command=["./scripts/feeds", "install", "-a"]))
 
                description = "Installing feeds",
                command=["./scripts/feeds", "install", "-a"]))
 

+       # seed config
+       factory.addStep(FileDownload(
+               mastersrc = "config.seed",
+               slavedest = ".config",
+               mode = 0644
+       ))
+

        # configure
        factory.addStep(ShellCommand(
                name = "newconfig",
                description = "Seeding .config",
        # configure
        factory.addStep(ShellCommand(
                name = "newconfig",
                description = "Seeding .config",

-               command='''cat <<EOT > .config
-CONFIG_TARGET_%s=y
-CONFIG_TARGET_%s_%s=y
-CONFIG_ALL_NONSHARED=y
-CONFIG_SDK=y
-CONFIG_IB=y
-# CONFIG_IB_STANDALONE is not set
-CONFIG_DEVEL=y
-CONFIG_CCACHE=y
-CONFIG_SIGNED_PACKAGES=y
-# CONFIG_PER_FEED_REPO_ADD_COMMENTED is not set
-CONFIG_KERNEL_KALLSYMS=y
-CONFIG_COLLECT_KERNEL_DEBUG=y
-CONFIG_TARGET_ALL_PROFILES=y
-CONFIG_TARGET_MULTI_PROFILE=y
-CONFIG_TARGET_PER_DEVICE_ROOTFS=y
-EOT''' %(ts[0], ts[0], ts[1]) ))
+               command = "printf 'CONFIG_TARGET_%s=y\\nCONFIG_TARGET_%s_%s=y\\n' >> .config" %(ts[0], ts[0], ts[1])
+       ))

 
        factory.addStep(ShellCommand(
                name = "delbin",
 
        factory.addStep(ShellCommand(
                name = "delbin",