summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/bootstrap/include/stage-0-busybox.TARGETS57
-rw-r--r--src/bootstrap/stage-0-busybox.TARGETS31
2 files changed, 86 insertions, 2 deletions
diff --git a/src/bootstrap/include/stage-0-busybox.TARGETS b/src/bootstrap/include/stage-0-busybox.TARGETS
index 3e6d8ce..c465c5a 100644
--- a/src/bootstrap/include/stage-0-busybox.TARGETS
+++ b/src/bootstrap/include/stage-0-busybox.TARGETS
@@ -23,6 +23,7 @@
, "xatonum.h"
, "xregex.h"
, "common_bufsiz.h"
+ , "NUM_APPLETS.h"
]
}
, "common_bufsiz.h":
@@ -38,6 +39,11 @@
]
}
}
+, "NUM_APPLETS.h":
+ { "type": "file_gen"
+ , "name": "NUM_APPLETS.h"
+ , "data": "#define NUM_APPLETS 2 /* don't care, as long as it is >1 */"
+ }
, "libbb.h":
{ "type": "file_gen"
, "name": "libbb.h"
@@ -55,6 +61,8 @@
, "#define CONFIG_SHA3_SMALL 0"
, "#define CONFIG_PASSWORD_MINLEN 6"
, "#define CONFIG_PID_FILE_PATH \"\""
+ , "#define CONFIG_FEATURE_EDITING_MAX_LEN 1024"
+ , "#define CONFIG_SUBST_WCHAR 63"
, ""
, "#define ENABLE_DESKTOP 0"
, "#define ENABLE_TAR 1"
@@ -71,6 +79,29 @@
, "#define ENABLE_LOCALE_SUPPORT 0"
, "#define ENABLE_LONG_OPTS 0"
, "#define ENABLE_USE_BB_CRYPT_SHA 0"
+ , "#define ENABLE_ASH_OPTIMIZE_FOR_SIZE 1"
+ , "#define ENABLE_ASH_MAIL 0"
+ , "#define ENABLE_ASH_EXPAND_PRMT 1"
+ , "#define ENABLE_ASH_BASH_COMPAT 1"
+ , "#define ENABLE_ASH_HELP 1"
+ , "#define ENABLE_ASH_TEST 1"
+ , "#define ENABLE_ASH_ALIAS 1"
+ , "#define ENABLE_ASH_JOB_CONTROL 1"
+ , "#define ENABLE_ASH_CMDCMD 1"
+ , "#define ENABLE_ASH_ECHO 1"
+ , "#define ENABLE_ASH_GETOPTS 1"
+ , "#define ENABLE_ASH_RANDOM_SUPPORT 1"
+ , "#define ENABLE_KILLALL 1"
+ , "#define ENABLE_KILLALL5 1"
+ , "#define ENABLE_UNICODE_WIDE_WCHARS 0"
+ , "#define ENABLE_UNICODE_COMBINING_WCHARS 0"
+ , "#define ENABLE_UNICODE_SUPPORT 1"
+ , "#define ENABLE_UNICODE_USING_LOCALE 0"
+ , "#define ENABLE_TEST 1"
+ , "#define ENABLE_TEST1 1"
+ , "#define ENABLE_TEST2 1"
+ , "#define ENABLE_ASH_TEST 1"
+ , "#define ENABLE_HUSH_TEST 0"
, "#define ENABLE_FEATURE_VERBOSE 0"
, "#define ENABLE_FEATURE_SYSLOG 0"
, "#define ENABLE_FEATURE_CROND_D 0"
@@ -132,10 +163,23 @@
, "#define ENABLE_FEATURE_FIND_MAXDEPTH 0"
, "#define ENABLE_FEATURE_FIND_XDEV 0"
, "#define ENABLE_FEATURE_BZIP2_DECOMPRESS 0"
+ , "#define ENABLE_FEATURE_SH_READ_FRAC 1"
+ , "#define ENABLE_FEATURE_SH_MATH 1"
+ , "#define ENABLE_FEATURE_SH_STANDALONE 0"
+ , "#define ENABLE_FEATURE_EDITING 1"
+ , "#define ENABLE_FEATURE_TAB_COMPLETION 0"
+ , "#define ENABLE_FEATURE_USERNAME_COMPLETION 0"
+ , "#define ENABLE_FEATURE_EDITING_VI 0"
+ , "#define ENABLE_FEATURE_EDITING_MAX_LEN 1"
+ , "#define ENABLE_FEATURE_EDITING_WINCH 1"
+ , "#define ENABLE_FEATURE_EDITING_ASK_TERMINAL 0"
+ , "#define ENABLE_FEATURE_VI_ASK_TERMINAL 1"
+ , "#define ENABLE_FEATURE_LESS_ASK_TERMINAL 1"
+ , "#define ENABLE_FEATURE_CHECK_UNICODE_IN_ENV 0"
, ""
, "#define IF_DESKTOP(...)"
, "#define IF_NOT_DESKTOP(...) __VA_ARGS__"
- , "#define IF_SHELL_ASH(...)"
+ , "#define IF_SHELL_ASH(...) __VA_ARGS__"
, "#define IF_SHELL_HUSH(...)"
, "#define IF_ECHO(...)"
, "#define IF_SLEEP(...)"
@@ -144,6 +188,11 @@
, "#define IF_LS(...)"
, "#define IF_SELINUX(...)"
, "#define IF_EXTRA_COMPAT(...)"
+ , "#define IF_NOT_ASH_OPTIMIZE_FOR_SIZE(...)"
+ , "#define IF_ASH_EXPAND_PRMT(...) __VA_ARGS__"
+ , "#define IF_ASH_BASH_COMPAT(...) __VA_ARGS__"
+ , "#define IF_ASH_HELP(...) __VA_ARGS__"
+ , "#define IF_UNICODE_WIDE_WCHARS(...)"
, "#define IF_FEATURE_SHOW_THREADS(...)"
, "#define IF_FEATURE_CP_REFLINK(...)"
, "#define IF_FEATURE_SHADOWPASSWDS(...)"
@@ -199,6 +248,10 @@
, "#define IF_NOT_FEATURE_FIND_MAXDEPTH(...) __VA_ARGS__"
, "#define IF_FEATURE_FIND_XDEV(...)"
, "#define IF_FEATURE_BZIP2_DECOMPRESS(...)"
+ , "#define IF_FEATURE_SH_MATH(...) __VA_ARGS__"
+ , "#define IF_FEATURE_SH_STANDALONE(...)"
+ , "#define IF_FEATURE_EDITING_VI(...)"
+ , "#define IF_FEATURE_EDITING_WINCH(...) __VA_ARGS__"
, ""
, "/* missing declarations */"
, "char *strchrnul(const char *s, int c);"
@@ -208,4 +261,4 @@
]
}
}
-} \ No newline at end of file
+}
diff --git a/src/bootstrap/stage-0-busybox.TARGETS b/src/bootstrap/stage-0-busybox.TARGETS
index 8ffb80e..9778b2f 100644
--- a/src/bootstrap/stage-0-busybox.TARGETS
+++ b/src/bootstrap/stage-0-busybox.TARGETS
@@ -10,6 +10,7 @@
, "bin/bzip2": "bootstrap-bzip2"
, "bin/grep": "bootstrap-grep"
, "bin/find": "bootstrap-find"
+ , "bin/sh": "bootstrap-ash"
}
}
, "toolchain":
@@ -72,6 +73,12 @@
, "fixed_config": {"APPLET_GROUP": "findutils", "APPLET_NAME": "find"}
, "target": "configured-applet"
}
+, "bootstrap-ash":
+ { "type": "export"
+ , "flexible_config": ["ARCH", "TARGET_ARCH", "TOOLCHAIN_CONFIG", "ENV"]
+ , "fixed_config": {"APPLET_GROUP": "shell", "APPLET_NAME": "ash"}
+ , "target": "configured-applet"
+ }
, "configured-applet":
{ "type": "configure"
, "arguments_config": ["TOOLCHAIN_CONFIG"]
@@ -120,16 +127,23 @@
, "archival/libarchive/bz/huffman.c"
, "findutils/grep.c"
, "findutils/find.c"
+ , "shell/ash.c"
+ , "shell/shell_common.h"
+ , "shell/math.h"
+ , "shell/random.h"
]
}
, "bootstrap-sources":
{ "type": "install"
, "deps":
[ "appletlib.c"
+ , "libbb/auto_string.c"
+ , "libbb/bb_getgroups.c"
, "libbb/bb_pwd.c"
, "libbb/bb_strtonum.c"
, "libbb/concat_path_file.c"
, "libbb/concat_subpath_file.c"
+ , "libbb/const_hack.c"
, "libbb/common_bufsiz.c"
, "libbb/compare_string_array.c"
, "libbb/copyfd.c"
@@ -138,22 +152,28 @@
, "libbb/endofname.c"
, "libbb/fclose_nonstdin.c"
, "libbb/fflush_stdout_and_exit.c"
+ , "libbb/find_pid_by_name.c"
, "libbb/full_write.c"
, "libbb/get_last_path_component.c"
, "libbb/get_line_from_file.c"
, "libbb/getopt32.c"
, "libbb/isqrt.c"
, "libbb/last_char_is.c"
+ , "libbb/lineedit.c"
+ , "libbb/lineedit_ptr_hack.c"
, "libbb/llist.c"
, "libbb/makedev.c"
, "libbb/make_directory.c"
, "libbb/messages.c"
, "libbb/mode_string.c"
+ , "libbb/parse_mode.c"
, "libbb/perror_msg.c"
, "libbb/process_escape_sequence.c"
, "libbb/procps.c"
, "libbb/ptr_to_globals.c"
+ , "libbb/printable_string.c"
, "libbb/read.c"
+ , "libbb/read_key.c"
, "libbb/read_printf.c"
, "libbb/recursive_action.c"
, "libbb/safe_poll.c"
@@ -161,7 +181,10 @@
, "libbb/safe_write.c"
, "libbb/signals.c"
, "libbb/skip_whitespace.c"
+ , "libbb/sysconf.c"
, "libbb/time.c"
+ , "libbb/unicode.c"
+ , "libbb/u_signal_names.c"
, "libbb/verror_msg.c"
, "libbb/wfopen.c"
, "libbb/wfopen_input.c"
@@ -192,6 +215,14 @@
, "archival/libarchive/seek_by_read.c"
, "archival/libarchive/unsafe_prefix.c"
, "archival/libarchive/unsafe_symlink_target.c"
+ , "coreutils/echo.c"
+ , "coreutils/test.c"
+ , "coreutils/test_ptr_hack.c"
+ , "shell/ash_ptr_hack.c"
+ , "shell/math.c"
+ , "shell/random.c"
+ , "shell/shell_common.c"
+ , "procps/kill.c"
]
}
, "appletlib.c":