[yocto-autobuilder-helper][whinlatter 3/5] config.json: Fix bring up after bitbake-setup changes

From: Richard Purdie <[email protected]>

We have to leave MACHINE/DISTRO unset via fragments for oe-selftest, tweak the bringup
target setup to handle this.

Signed-off-by: Richard Purdie <[email protected]>
(cherry picked from commit fbb31b12e73053727a0f8e34252661aff9e8398f)
Signed-off-by: Yoann Congal <[email protected]>
---
 config.json | 35 +++++++++++++++++++++++++----------
 1 file changed, 25 insertions(+), 10 deletions(-)

diff --git a/config.json b/config.json
index 9cb8693..6000254 100644
--- a/config.json
+++ b/config.json
@@ -192,36 +192,51 @@
        "bringup" : {
             "BUILDINFO" : true,
             "SSTATEDIR" : ["SSTATE_DIR = '${HELPERBUILDDIR}/sstate'"],
-            "MACHINE" : "qemuarm64",
-             "step1" : {
-                 "SDKMACHINE" : "x86_64",
-                 "BBTARGETS" : "core-image-sato core-image-sato-sdk core-image-minimal core-image-sato:do_populate_sdk core-image-minimal:do_populate_sdk_ext core-image-sato:do_populate_sdk_ext",
-                 "SANITYTARGETS" : "core-image-minimal:do_testimage core-image-sato:do_testimage core-image-sato-sdk:do_testimage core-image-sato:do_testsdk core-image-minimal:do_testsdkext core-image-sato:do_testsdkext"
-             },
+            "MACHINE" : "unset",
+            "DISTRO" : "unset",
+            "step1" : {
+                "SDKMACHINE" : "x86_64",
+                "extravars" : [
+                    "MACHINE = 'qemuarm64'",
+                    "DISTRO = 'poky'"
+                ],
+                "BBTARGETS" : "core-image-sato core-image-sato-sdk core-image-minimal core-image-sato:do_populate_sdk core-image-minimal:do_populate_sdk_ext core-image-sato:do_populate_sdk_ext",
+                "SANITYTARGETS" : "core-image-minimal:do_testimage core-image-sato:do_testimage core-image-sato-sdk:do_testimage core-image-sato:do_testsdk core-image-minimal:do_testsdkext core-image-sato:do_testsdkext"
+            },
             "step2" : {
                 "SDKMACHINE" : "x86_64",
-                "MACHINE" : "qemux86-64",
+                "extravars" : [
+                    "MACHINE = 'qemux86-64'",
+                    "DISTRO = 'poky'"
+                ],
                 "BBTARGETS" : "core-image-sato core-image-sato-sdk core-image-minimal core-image-ptest-all core-image-sato:do_populate_sdk core-image-minimal:do_populate_sdk_ext",
                 "SANITYTARGETS" : "core-image-sato:do_testsdk"
 
             },
             "step3" : {
                  "SDKMACHINE" : "i686",
+                 "extravars" : [
+                    "MACHINE = 'qemuarm64'",
+                    "DISTRO = 'poky'"
+                 ],
                  "BBTARGETS" : "core-image-sato:do_populate_sdk",
                  "SANITYTARGETS" : "core-image-sato:do_testsdk"
-             },
+            },
             "step4" : {
-                "MACHINE" : "qemux86-64",
                 "SDKMACHINE" : "i686",
+                 "extravars" : [
+                    "MACHINE = 'qemux86-64'",
+                    "DISTRO = 'poky'"
+                 ],
                 "BBTARGETS" : "core-image-sato:do_populate_sdk",
                 "SANITYTARGETS" : "core-image-sato:do_testsdk"
             },
             "step5" : {
                 "BUILDINFO" : false,
-                "MACHINE" : "qemux86-64",
                 "SDKMACHINE" : "x86_64",
                 "PACKAGE_CLASSES" : "package_rpm",
                 "extravars" : [
+                    "MACHINE = 'qemux86-64'",
                     "RPM_GPG_SIGN_CHUNK = '1'"
                 ],
                 "EXTRACMDS" : ["DISPLAY=:1 oe-selftest -a --skip-tests distrodata.Distrodata.test_checkpkg -T yocto-mirrors -T machine -T toolchain-user -T toolchain-system -j 15"],