diff mbox series

[yocto-autobuilder-helper] config.json: use INIT_MANAGER

Message ID 20240102023000.4006647-1-Qi.Chen@windriver.com
State New
Headers show
Series [yocto-autobuilder-helper] config.json: use INIT_MANAGER | expand

Commit Message

ChenQi Jan. 2, 2024, 2:30 a.m. UTC 
From: Chen Qi <Qi.Chen@windriver.com>

The default INIT_MANAGER is 'sysvinit', to use systemd as the init
manager, we use INIT_MANAGER = 'systemd' because we can make use
of the settings in conf/distro/include/init-manager-systemd.inc.

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
 config.json | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)
diff mbox series

Patch

diff --git a/config.json b/config.json
index d504d07..6024161 100644
--- a/config.json
+++ b/config.json
@@ -1107,9 +1107,8 @@ 
                 "shortname" : "Systemd weston",
                 "extravars" : [
                      "TEST_SUITES:append = ' systemd'",
-                     "DISTRO_FEATURES:append = ' pam systemd usrmerge'",
-                     "VIRTUAL-RUNTIME_init_manager = 'systemd'",
-                     "DISTRO_FEATURES_BACKFILL_CONSIDERED = 'sysvinit'"
+                     "INIT_MANAGER = 'systemd'",
+                     "DISTRO_FEATURES:append = ' pam'",
                 ]
             }
         },
@@ -1422,8 +1421,8 @@ 
                 "BBTARGETS" : "core-image-sato",
                 "SANITYTARGETS" : "core-image-sato:do_testimage",
                 "extravars" : [
-                    "DISTRO_FEATURES:append = ' systemd usrmerge'",
-                    "VIRTUAL-RUNTIME_init_manager = 'systemd'",
+                    "INIT_MANAGER = 'systemd'",
+                    "DISTRO_FEATURES_BACKFILL_CONSIDERED:remove = 'sysvinit'",
                     "TEST_SUITES:append = ' systemd'"
                 ]
             },
@@ -1442,9 +1441,7 @@ 
                 "SANITYTARGETS" : "core-image-sato:do_testimage",
                 "extravars" : [
                     "TEST_SUITES:append = ' systemd'",
-                    "DISTRO_FEATURES:append = ' systemd usrmerge'",
-                    "VIRTUAL-RUNTIME_init_manager = 'systemd'",
-                    "DISTRO_FEATURES_BACKFILL_CONSIDERED = 'sysvinit'"
+                    "INIT_MANAGER = 'systemd'",
                 ]
             },
             "step7" : {