[oe-commits] [openembedded-core] 04/13: busybox: move reboot out of init.cfg

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit 4a20e8a397ec92fd60b74393645cd21134af30eb
Author: Anuj Mittal <anuj.mittal at intel.com>
AuthorDate: Thu Oct 11 16:41:10 2018 +0800

    busybox: move reboot out of init.cfg
    
    reboot is needed for initramfs where no init manager is set. This
    partially reverts:
    
    commit b6fbb3f3d4d6367b0fd7921078f67057551c7ede
    Author: Chen Qi <Qi.Chen at windriver.com>
    Date:   Mon Jul 30 17:41:57 2018 +0800
    
        busybox: move init related configs to init.cfg
    
        Move init related configs to init.cfg.
    
        These config items do not make much sense unless busybox is selected
        as the init manager. They should belong to init.cfg.
    
    We would need to set up ALTERNATIVES for reboot in this case.
    
    Signed-off-by: Anuj Mittal <anuj.mittal at intel.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/recipes-core/busybox/busybox/defconfig | 2 +-
 meta/recipes-core/busybox/busybox/init.cfg  | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/meta/recipes-core/busybox/busybox/defconfig b/meta/recipes-core/busybox/busybox/defconfig
index f081f28..32213c0 100644
--- a/meta/recipes-core/busybox/busybox/defconfig
+++ b/meta/recipes-core/busybox/busybox/defconfig
@@ -480,7 +480,7 @@ CONFIG_FEATURE_XARGS_SUPPORT_REPL_STR=y
 # CONFIG_FEATURE_BOOTCHARTD_CONFIG_FILE is not set
 # CONFIG_HALT is not set
 # CONFIG_POWEROFF is not set
-# CONFIG_REBOOT is not set
+CONFIG_REBOOT=y
 # CONFIG_FEATURE_CALL_TELINIT is not set
 # CONFIG_TELINIT_PATH is not set
 # CONFIG_INIT is not set
diff --git a/meta/recipes-core/busybox/busybox/init.cfg b/meta/recipes-core/busybox/busybox/init.cfg
index b69fe0e..e967006 100644
--- a/meta/recipes-core/busybox/busybox/init.cfg
+++ b/meta/recipes-core/busybox/busybox/init.cfg
@@ -3,7 +3,6 @@ CONFIG_RUNLEVEL=y
 CONFIG_FEATURE_USE_INITTAB=y
 CONFIG_HALT=y
 CONFIG_POWEROFF=y
-CONFIG_REBOOT=y
 CONFIG_FEATURE_KILL_DELAY=0
 CONFIG_TELINIT_PATH=""
 CONFIG_INIT_TERMINAL_TYPE=""

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.