Browse Source

busybox: add missing symbols for noMMU case

Waldemar Brodkorb 3 years ago
parent
commit
cb21a6af17

+ 8 - 0
package/busybox/config/miscutils/Config.in

@@ -733,6 +733,14 @@ config BUSYBOX_MICROCOM
 	help
 	  The poor man's minicom utility for chatting with serial port devices.
 
+config BUSYBOX_MIM
+	bool "mim (0.5 kb)"
+	default n
+	depends on BUSYBOX_FEATURE_SH_EMBEDDED_SCRIPTS
+	help
+	Run a script from a Makefile-like specification file.
+	Unlike 'make' dependencies aren't supported.
+
 config BUSYBOX_MOUNTPOINT
 	bool "mountpoint"
 	default n

+ 4 - 4
package/busybox/config/networking/Config.in

@@ -57,15 +57,15 @@ config BUSYBOX_NETCAT
 
 config BUSYBOX_NC_SERVER
 	bool "Netcat server options (-l)"
-	default y
-	depends on BUSYBOX_NC
+	default n
+	depends on BUSYBOX_NC || BUSYBOX_NETCAT
 	help
 	  Allow netcat to act as a server.
 
 config BUSYBOX_NC_EXTRA
 	bool "Netcat extensions (-eiw and filename)"
 	default y
-	depends on BUSYBOX_NC
+	depends on BUSYBOX_NC || BUSYBOX_NETCAT
 	help
 	  Add -e (support for executing the rest of the command line after
 	  making or receiving a successful connection), -i (delay interval for
@@ -74,7 +74,7 @@ config BUSYBOX_NC_EXTRA
 config BUSYBOX_NC_110_COMPAT
 	bool "Netcat 1.10 compatibility (+2.5k)"
 	default n  # off specially for Rob
-	depends on BUSYBOX_NC
+	depends on BUSYBOX_NC || BUSYBOX_NETCAT
 	help
 	  This option makes nc closely follow original nc-1.10.
 	  The code is about 2.5k bigger. It enables

+ 142 - 0
package/busybox/config/shell/Config.in

@@ -210,6 +210,18 @@ config BUSYBOX_HUSH_BRACE_EXPANSION
 	help
 	  Enable {abc,def} extension.
 
+config BUSYBOX_HUSH_LINENO_VAR
+	bool "$LINENO variable"
+	default y
+	depends on BUSYBOX_HUSH_BASH_COMPAT
+
+config BUSYBOX_HUSH_BASH_SOURCE_CURDIR
+	bool "'source' and '.' builtins search current directory after $PATH"
+	default n   # do not encourage non-standard behavior
+	depends on BUSYBOX_HUSH_BASH_COMPAT
+	help
+	This is not compliant with standards. Avoid if possible.
+
 config BUSYBOX_HUSH_HELP
 	bool "help builtin"
 	default y
@@ -310,6 +322,111 @@ config BUSYBOX_HUSH_MODE_X
 	  This instructs hush to print commands before execution.
 	  Adds ~300 bytes.
 
+config BUSYBOX_HUSH_ECHO
+	bool "echo builtin"
+	default y
+	depends on BUSYBOX_SHELL_HUSH
+
+config BUSYBOX_HUSH_PRINTF
+	bool "printf builtin"
+	default y
+	depends on BUSYBOX_SHELL_HUSH
+
+config BUSYBOX_HUSH_TEST
+	bool "test builtin"
+	default y
+	depends on BUSYBOX_SHELL_HUSH
+
+config BUSYBOX_HUSH_HELP
+	bool "help builtin"
+	default y
+	depends on BUSYBOX_SHELL_HUSH
+
+config BUSYBOX_HUSH_EXPORT
+	bool "export builtin"
+	default y
+	depends on BUSYBOX_SHELL_HUSH
+
+config BUSYBOX_HUSH_EXPORT_N
+	bool "Support 'export -n' option"
+	default y
+	depends on BUSYBOX_HUSH_EXPORT
+	help
+	export -n unexports variables. It is a bash extension.
+
+config BUSYBOX_HUSH_READONLY
+	bool "readonly builtin"
+	default y
+	depends on BUSYBOX_SHELL_HUSH
+	help
+	Enable support for read-only variables.
+
+config BUSYBOX_HUSH_KILL
+	bool "kill builtin (supports kill %jobspec)"
+	default y
+	depends on BUSYBOX_SHELL_HUSH
+
+config BUSYBOX_HUSH_WAIT
+	bool "wait builtin"
+	default y
+	depends on BUSYBOX_SHELL_HUSH
+
+config BUSYBOX_HUSH_COMMAND
+	bool "command builtin"
+	default y
+	depends on BUSYBOX_SHELL_HUSH
+
+config BUSYBOX_HUSH_TRAP
+	bool "trap builtin"
+	default y
+	depends on BUSYBOX_SHELL_HUSH
+
+config BUSYBOX_HUSH_TYPE
+	bool "type builtin"
+	default y
+	depends on BUSYBOX_SHELL_HUSH
+
+config BUSYBOX_HUSH_TIMES
+	bool "times builtin"
+	default y
+	depends on BUSYBOX_SHELL_HUSH
+
+config BUSYBOX_HUSH_READ
+	bool "read builtin"
+	default y
+	depends on BUSYBOX_SHELL_HUSH
+
+config BUSYBOX_HUSH_SET
+	bool "set builtin"
+	default y
+	depends on BUSYBOX_SHELL_HUSH
+
+config BUSYBOX_HUSH_UNSET
+	bool "unset builtin"
+	default y
+	depends on BUSYBOX_SHELL_HUSH
+
+config BUSYBOX_HUSH_ULIMIT
+	bool "ulimit builtin"
+	default y
+	depends on BUSYBOX_SHELL_HUSH
+
+config BUSYBOX_HUSH_UMASK
+	bool "umask builtin"
+	default y
+	depends on BUSYBOX_SHELL_HUSH
+
+config BUSYBOX_HUSH_GETOPTS
+	bool "getopts builtin"
+	default y
+	depends on BUSYBOX_SHELL_HUSH
+
+config BUSYBOX_HUSH_MEMLEAK
+	bool "memleak builtin (debugging)"
+	default n
+	depends on BUSYBOX_SHELL_HUSH
+
+
 choice
 prompt "Choose which shell is aliased to 'sh' name"
 
@@ -354,6 +471,11 @@ config BUSYBOX_FEATURE_SH_MATH_64
 	  slightly larger, but will allow computation with very large numbers.
 	  This is not in POSIX, so do not rely on this in portable code.
 
+config BUSYBOX_FEATURE_SH_MATH_BASE
+	bool "Support BASE#nnnn literals"
+	default y
+	depends on BUSYBOX_FEATURE_SH_MATH
+
 config BUSYBOX_FEATURE_SH_EXTRA_QUIET
 	bool "Hide message on interactive shell startup"
 	default y
@@ -412,6 +534,13 @@ config BUSYBOX_FEATURE_SH_NOFORK
 	  This feature is relatively new. Use with care. Report bugs
 	  to project mailing list.
 
+config BUSYBOX_FEATURE_SH_READ_FRAC
+	bool "read -t N.NNN support (+110 bytes)"
+	default y
+	depends on BUSYBOX_SHELL_ASH || BUSYBOX_SHELL_HUSH
+	help
+	Enable support for fractional second timeout in read builtin.
+
 config BUSYBOX_FEATURE_SH_HISTFILESIZE
 	bool "Use $HISTFILESIZE"
 	default y
@@ -421,5 +550,18 @@ config BUSYBOX_FEATURE_SH_HISTFILESIZE
 	  to set shell history size. Note that its max value is capped
 	  by "History size" setting in library tuning section.
 
+config BUSYBOX_FEATURE_SH_EMBEDDED_SCRIPTS
+	bool "Embed scripts in the binary"
+	default y
+	depends on BUSYBOX_SHELL_ASH || BUSYBOX_SHELL_HUSH
+	help
+	Allow scripts to be compressed and embedded in the busybox
+	binary. The scripts should be placed in the 'embed' directory
+	at build time. Like applets, scripts can be run as
+	'busybox SCRIPT ...' or by linking their name to the binary.
+
+	This also allows applets to be implemented as scripts: place
+	the script in 'applets_sh' and a stub C file containing
+	configuration in the appropriate subsystem directory.
 
 endmenu

+ 21 - 0
package/busybox/config/util-linux/Config.in

@@ -128,6 +128,27 @@ config BUSYBOX_MKDOSFS
 	help
 	  Utility to create FAT32 filesystems.
 
+config BUSYBOX_NOLOGIN
+	bool "nologin"
+	default n
+	depends on BUSYBOX_FEATURE_SH_EMBEDDED_SCRIPTS
+	help
+	Politely refuse a login
+
+config BUSYBOX_NOLOGIN_DEPENDENCIES
+	bool "Enable dependencies for nologin"
+	default n  # Y default makes it harder to select single-applet test
+	depends on BUSYBOX_NOLOGIN
+	select BUSYBOX_CAT
+	select BUSYBOX_ECHO
+	select BUSYBOX_SLEEP
+	help
+	nologin is implemented as a shell script. It requires the
+	following in the runtime environment:
+		cat echo sleep
+	If you know these will be available externally you can
+	disable this option.
+
 config BUSYBOX_NSENTER
 	bool "nsenter"
 	default n