summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAnuj Mittal <anuj.mittal@intel.com>2018-10-11 16:41:10 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-10-12 16:57:21 +0100
commitef4a417ab04779bd9fc8a6540a20cca7d14e98cf (patch)
tree7e3cd90dd49dd1038e43ca263be2c6b66e1e73f4 /meta
parente574eab5006601c19fdab098e77b34adad7ce6eb (diff)
downloadpoky-ef4a417ab04779bd9fc8a6540a20cca7d14e98cf.tar.gz
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@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. (From OE-Core rev: 239a4fc1db530f201e1f7069b2045135699a85a7) Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/busybox/busybox/defconfig2
-rw-r--r--meta/recipes-core/busybox/busybox/init.cfg1
2 files changed, 1 insertions, 2 deletions
diff --git a/meta/recipes-core/busybox/busybox/defconfig b/meta/recipes-core/busybox/busybox/defconfig
index f081f281cc..32213c0675 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
480# CONFIG_FEATURE_BOOTCHARTD_CONFIG_FILE is not set 480# CONFIG_FEATURE_BOOTCHARTD_CONFIG_FILE is not set
481# CONFIG_HALT is not set 481# CONFIG_HALT is not set
482# CONFIG_POWEROFF is not set 482# CONFIG_POWEROFF is not set
483# CONFIG_REBOOT is not set 483CONFIG_REBOOT=y
484# CONFIG_FEATURE_CALL_TELINIT is not set 484# CONFIG_FEATURE_CALL_TELINIT is not set
485# CONFIG_TELINIT_PATH is not set 485# CONFIG_TELINIT_PATH is not set
486# CONFIG_INIT is not set 486# CONFIG_INIT is not set
diff --git a/meta/recipes-core/busybox/busybox/init.cfg b/meta/recipes-core/busybox/busybox/init.cfg
index b69fe0ea9c..e96700682a 100644
--- a/meta/recipes-core/busybox/busybox/init.cfg
+++ b/meta/recipes-core/busybox/busybox/init.cfg
@@ -3,7 +3,6 @@ CONFIG_RUNLEVEL=y
3CONFIG_FEATURE_USE_INITTAB=y 3CONFIG_FEATURE_USE_INITTAB=y
4CONFIG_HALT=y 4CONFIG_HALT=y
5CONFIG_POWEROFF=y 5CONFIG_POWEROFF=y
6CONFIG_REBOOT=y
7CONFIG_FEATURE_KILL_DELAY=0 6CONFIG_FEATURE_KILL_DELAY=0
8CONFIG_TELINIT_PATH="" 7CONFIG_TELINIT_PATH=""
9CONFIG_INIT_TERMINAL_TYPE="" 8CONFIG_INIT_TERMINAL_TYPE=""