7a43bd07e
Rob Landley
2006-01-20
Subject
Zap sysdeps directory, moving Config.in and defconfig to top of tree. (Busybox should not be system dependent enough to have different default configurations for different platforms. We're not a kernel.)
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
sysdeps/linux/Config.in → Config.in+6 -58
| @@ -9,10 +9,6 @@ config HAVE_DOT_CONFIG | |
| bool | |
| default y | |
| - | config MODULES |
| - | bool |
| - | default y |
| - | |
| menu "General Configuration" | |
| choice | |
| @@ -168,35 +164,6 @@ config CONFIG_STATIC | |
| Most people will leave this set to 'N'. | |
| - | config CONFIG_BUILD_LIBBUSYBOX |
| - | bool "Build shared libbusybox" |
| - | default y |
| - | help |
| - | Build a shared library libbusybox.so which contains all |
| - | libraries used inside busybox. |
| - | |
| - | config CONFIG_FEATURE_FULL_LIBBUSYBOX |
| - | bool "Feature-complete libbusybox" |
| - | default n if !CONFIG_FEATURE_SHARED_BUSYBOX |
| - | depends on CONFIG_BUILD_LIBBUSYBOX |
| - | help |
| - | Build a libbusybox with the complete feature-set, disregarding |
| - | the actually selected config. |
| - | |
| - | Normally, libbusybox will only contain the features which are |
| - | used by busybox itself. If you plan to write a separate |
| - | standalone application which uses libbusybox say 'Y'. |
| - | |
| - | Say 'N' if in doubt. |
| - | |
| - | config CONFIG_FEATURE_SHARED_BUSYBOX |
| - | bool "Use shared libbusybox for busybox" |
| - | default y if CONFIG_BUILD_LIBBUSYBOX |
| - | depends on !CONFIG_STATIC && CONFIG_BUILD_LIBBUSYBOX |
| - | help |
| - | Use libbusybox.so also for busybox itself. |
| - | You need to have a working dynamic linker to use this variant. |
| - | |
| config CONFIG_LFS | |
| bool "Build with Large File Support (for accessing files > 2 GB)" | |
| default n | |
| @@ -236,25 +203,6 @@ config EXTRA_CFLAGS_OPTIONS | |
| if you want to add some simple compiler switches (like -march=i686), | |
| or check for warnings using -Werror, just those options here. | |
| - | config CONFIG_BUILD_AT_ONCE |
| - | bool "Compile all sources at once" |
| - | default n |
| - | help |
| - | Normally each source-file is compiled with one invocation of |
| - | the compiler. |
| - | If you set this option, all sources are compiled at once. |
| - | This gives the compiler more opportunities to optimize which can |
| - | result in smaller and/or faster binaries. |
| - | |
| - | Setting this option will consume alot of memory, e.g. if you |
| - | enable all applets with all features, gcc uses more than 300MB |
| - | RAM during compilation of busybox. |
| - | |
| - | This option is most likely only beneficial for newer compilers |
| - | such as gcc-4.1 and above. |
| - | |
| - | Say 'N' unless you know what you are doing. |
| - | |
| config CONFIG_FEATURE_SUSv2 | |
| bool "Enable features that are in SuSv2 but not SuSv3?" | |
| default y | |
| @@ -268,9 +216,7 @@ config CONFIG_FEATURE_SUSv2_OBSOLETE | |
| depends on CONFIG_FEATURE_SUSv2 | |
| default y | |
| help | |
| - | Enable pre- SuSv2 features which are deprecated in SuSv2 and |
| - | above. |
| - | Disables support for e.g. numeric arguments in fold. |
| + | Disables support for numeric arguments in fold. |
| endmenu | |
| @@ -318,24 +264,26 @@ config PREFIX | |
| help | |
| Define your directory to install BusyBox files/subdirs in. | |
| + | |
| + | |
| endmenu | |
| source archival/Config.in | |
| source coreutils/Config.in | |
| source console-tools/Config.in | |
| source debianutils/Config.in | |
| + | source e2fsprogs/Config.in |
| source editors/Config.in | |
| source findutils/Config.in | |
| source init/Config.in | |
| source loginutils/Config.in | |
| - | source e2fsprogs/Config.in |
| - | source modutils/Config.in |
| - | source util-linux/Config.in |
| source miscutils/Config.in | |
| + | source modutils/Config.in |
| source networking/Config.in | |
| source procps/Config.in | |
| source shell/Config.in | |
| source sysklogd/Config.in | |
| + | source util-linux/Config.in |
| menu 'Debugging Options' | |
Makefile+2 -2
| @@ -36,8 +36,8 @@ SRC_DIRS:=$(patsubst %,$(top_srcdir)/%,$(DIRS)) | |
| .PHONY: _all | |
| _all: | |
| - | CONFIG_CONFIG_IN = $(top_srcdir)/sysdeps/$(TARGET_OS)/Config.in |
| - | CONFIG_DEFCONFIG = $(top_srcdir)/sysdeps/$(TARGET_OS)/defconfig |
| + | CONFIG_CONFIG_IN = $(top_srcdir)/Config.in |
| + | CONFIG_DEFCONFIG = $(top_srcdir)/defconfig |
| ifeq ($(KBUILD_SRC),) | |
?+0 -0
scripts/config/confdata.c+1 -1
| @@ -15,7 +15,7 @@ | |
| const char conf_def_filename[] = ".config"; | |
| - | const char conf_defname[] = "sysdeps/linux/defconfig"; |
| + | const char conf_defname[] = "defconfig"; |
| const char *conf_confnames[] = { | |
| ".config", | |