Fix menu usage for better embtk integration and fix remaining kconfig symbolsembtk-busybox-kconfigs-1.13.4

Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>

1 files changed, 23 insertions, 20 deletions

diff --git a/busybox.kconfig b/busybox.kconfig
index 50894e6..1f22ad2 100644
--- a/busybox.kconfig
+++ b/busybox.kconfig
@@ -3,13 +3,17 @@
 # see scripts/kbuild/config-language.txt.
 #
 
+
 config KEMBTK_BUSYB_HAVE_DOT_CONFIG
 	bool
 	default y
-
-menu "Busybox Settings"
-
-menu "General Configuration"
+comment "----------------------------------------------------------------------"
+comment "------------------------ Busybox Settings ------------------"
+comment "----------------------------------------------------------------------"
+comment ""
+comment "-------------------------------------------------"
+comment "----- General Configuration"
+comment "-------------------------------------------------"
 
 config KEMBTK_BUSYB_DESKTOP
 	bool "Enable options for full-blown desktop systems"
@@ -252,9 +256,9 @@ config KEMBTK_BUSYB_FEATURE_HAVE_RPC
 	#  This is automatically selected if any of enabled applets need it.
 	#  You do not need to select it manually.
 
-endmenu
-
-menu 'Build Options'
+comment "-------------------------------------------------"
+comment "----- Build Options"
+comment "-------------------------------------------------"
 
 config KEMBTK_BUSYB_STATIC
 	bool "Build BusyBox as a static binary (no shared libs)"
@@ -271,7 +275,7 @@ config KEMBTK_BUSYB_STATIC
 
 config KEMBTK_BUSYB_PIE
 	bool "Build BusyBox as a position independent executable"
-	depends on !STATIC
+	depends on !KEMBTK_BUSYB_STATIC
 	help
 	  (TODO: what is it and why/when is it useful?)
 	  Most people will leave this set to 'N'.
@@ -290,7 +294,7 @@ config KEMBTK_BUSYB_NOMMU
 # build system does not support that
 config KEMBTK_BUSYB_BUILD_LIBBUSYBOX
 	bool "Build shared libbusybox"
-	depends on !FEATURE_PREFER_APPLETS && !PIE && !STATIC
+	depends on !KEMBTK_BUSYB_FEATURE_PREFER_APPLETS && !KEMBTK_BUSYB_PIE && !KEMBTK_BUSYB_STATIC
 	help
 	  Build a shared library libbusybox.so.N.N.N which contains all
 	  busybox code.
@@ -375,7 +379,7 @@ config KEMBTK_BUSYB_LFS
 	  than 2 Gigabytes, enable this option. Otherwise, leave it set to 'N'.
 
 config KEMBTK_BUSYB_CROSS_COMPILER_PREFIX
-	string "Cross Compiler prefix"
+	string
 	default ""
 	help
 	  If you want to build BusyBox with a cross compiler, then you
@@ -387,9 +391,9 @@ config KEMBTK_BUSYB_CROSS_COMPILER_PREFIX
 
 	  Native builds leave this empty.
 
-endmenu
-
-menu 'Debugging Options'
+comment "-------------------------------------------------"
+comment "----- Debugging Options"
+comment "-------------------------------------------------"
 
 config KEMBTK_BUSYB_DEBUG
 	bool "Build BusyBox with extra Debugging symbols"
@@ -471,9 +475,9 @@ config KEMBTK_BUSYB_INCLUDE_SUSv2
 ### config PARSE
 ### 	bool "Uniform config file parser debugging applet: parse"
 
-endmenu
-
-menu 'Installation Options'
+comment "-------------------------------------------------"
+comment "----- Installation Options:"
+comment "-------------------------------------------------"
 
 config KEMBTK_BUSYB_INSTALL_NO_USR
 	bool "Don't use /usr"
@@ -543,13 +547,12 @@ config KEMBTK_BUSYB_PREFIX
 	help
 	  Define your directory to install BusyBox files/subdirs in.
 
-endmenu
 
 source packages/busybox/busybox-kconfigs/busybox-libbb.kconfig
 
-endmenu
-
-comment "Applets"
+comment "-------------------------------------------------"
+comment "----- Applets"
+comment "-------------------------------------------------"
 
 source packages/busybox/busybox-kconfigs/busybox-archival.kconfig
 source packages/busybox/busybox-kconfigs/busybox-coreutils.kconfig