326edc3e3
Denys Vlasenko
2016-12-22
Subject
Tweak some config defaults; fix MODPROBE_SMALL ordering in "make config"
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
include/applets.h.sh +4 -4init/init.c +1 -1modutils/Config.src +31 -0modutils/modprobe-small.c +3 -31shell/ash.c +2 -3
include/applets.h.sh+4 -4
| @@ -6,9 +6,6 @@ | |
| # CONFIG_applet names | |
| grep ^IF_ applets.h | grep -v IF_FEATURE_ | sed 's/IF_\([A-Z0-9._-]*\)(.*/\1/' \ | |
| | grep -v MODPROBE_SMALL \ | |
| - | | sed 's/BB_SYSCTL/SYSCTL/' \ |
| - | | sed 's/TEST1/[/' \ |
| - | | sed 's/TEST2/[[/' \ |
| | sort | uniq \ | |
| >applets_APP1 | |
| @@ -17,8 +14,11 @@ grep ^IF_ applets.h | sed -e's/ //g' -e's/.*(\([a-z[][^,]*\),.*/\1/' \ | |
| | grep -v '^bash$' \ | |
| | grep -v '^sh$' \ | |
| | tr a-z A-Z \ | |
| + | | sed 's/^SYSCTL$/BB_SYSCTL/' \ |
| + | | sed 's/^\[\[$/TEST1/' \ |
| + | | sed 's/^\[$/TEST2/' \ |
| | sort | uniq \ | |
| >applets_APP2 | |
| diff -u applets_APP1 applets_APP2 >applets_APP.diff | |
| - | rm applets_APP1 applets_APP2 |
| + | #rm applets_APP1 applets_APP2 |
init/init.c+1 -1
| @@ -83,7 +83,7 @@ | |
| //config: | |
| //config:config FEATURE_INIT_COREDUMPS | |
| //config: bool "Support dumping core for child processes (debugging only)" | |
| - | //config: default y |
| + | //config: default n # not Y because this is a debug option |
| //config: depends on INIT || LINUXRC | |
| //config: help | |
| //config: If this option is enabled and the file /.init_enable_core | |
modutils/Config.src+31 -0
| @@ -5,6 +5,37 @@ | |
| menu "Linux Module Utilities" | |
| + | config MODPROBE_SMALL |
| + | bool "Simplified modutils" |
| + | default y |
| + | select PLATFORM_LINUX |
| + | help |
| + | Simplified modutils. |
| + | |
| + | With this option modprobe does not require modules.dep file |
| + | and does not use /etc/modules.conf file. |
| + | It scans module files in /lib/modules/`uname -r` and |
| + | determines dependencies and module alias names on the fly. |
| + | This may make module loading slower, most notably |
| + | when one needs to load module by alias (this requires |
| + | scanning through module _bodies_). |
| + | |
| + | At the first attempt to load a module by alias modprobe |
| + | will try to generate modules.dep.bb file in order to speed up |
| + | future loads by alias. Failure to do so (read-only /lib/modules, |
| + | etc) is not reported, and future modprobes will be slow too. |
| + | |
| + | NB: modules.dep.bb file format is not compatible |
| + | with modules.dep file as created/used by standard module tools. |
| + | |
| + | Additional module parameters can be stored in |
| + | /etc/modules/$module_name files. |
| + | |
| + | Apart from modprobe, other utilities are also provided: |
| + | - insmod is an alias to modprobe |
| + | - rmmod is an alias to modprobe -r |
| + | - depmod generates modules.dep.bb |
| + | |
| INSERT | |
| comment "Options common to multiple modutils" | |
modutils/modprobe-small.c+3 -31
| @@ -7,37 +7,9 @@ | |
| * | |
| * Licensed under GPLv2, see file LICENSE in this source tree. | |
| */ | |
| - | //config:config MODPROBE_SMALL |
| - | //config: bool "Simplified modutils" |
| - | //config: default y |
| - | //config: select PLATFORM_LINUX |
| - | //config: help |
| - | //config: Simplified modutils. |
| - | //config: |
| - | //config: With this option modprobe does not require modules.dep file |
| - | //config: and does not use /etc/modules.conf file. |
| - | //config: It scans module files in /lib/modules/`uname -r` and |
| - | //config: determines dependencies and module alias names on the fly. |
| - | //config: This may make module loading slower, most notably |
| - | //config: when one needs to load module by alias (this requires |
| - | //config: scanning through module _bodies_). |
| - | //config: |
| - | //config: At the first attempt to load a module by alias modprobe |
| - | //config: will try to generate modules.dep.bb file in order to speed up |
| - | //config: future loads by alias. Failure to do so (read-only /lib/modules, |
| - | //config: etc) is not reported, and future modprobes will be slow too. |
| - | //config: |
| - | //config: NB: modules.dep.bb file format is not compatible |
| - | //config: with modules.dep file as created/used by standard module tools. |
| - | //config: |
| - | //config: Additional module parameters can be stored in |
| - | //config: /etc/modules/$module_name files. |
| - | //config: |
| - | //config: Apart from modprobe, other utilities are also provided: |
| - | //config: - insmod is an alias to modprobe |
| - | //config: - rmmod is an alias to modprobe -r |
| - | //config: - depmod generates modules.dep.bb |
| - | //config: |
| + | |
| + | /* config MODPROBE_SMALL is defined in Config.src to ensure better "make config" order */ |
| + | |
| //config:config FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE | |
| //config: bool "Accept module options on modprobe command line" | |
| //config: default y | |
shell/ash.c+2 -3
| @@ -117,7 +117,7 @@ | |
| //config: | |
| //config:config ASH_INTERNAL_GLOB | |
| //config: bool "Use internal glob() implementation" | |
| - | //config: default n |
| + | //config: default y # Y is bigger, but because of uclibc glob() bug, let Y be default for now |
| //config: depends on ASH | |
| //config: help | |
| //config: Do not use glob() function from libc, use internal implementation. | |
| @@ -218,11 +218,10 @@ | |
| //config: | |
| //config:config ASH_MAIL | |
| //config: bool "Check for new mail on interactive shells" | |
| - | //config: default n |
| + | //config: default y |
| //config: depends on ASH | |
| //config: help | |
| //config: Enable "check for new mail" function in the ash shell. | |
| - | //config: |
| //applet:IF_ASH(APPLET(ash, BB_DIR_BIN, BB_SUID_DROP)) | |
| //applet:IF_FEATURE_SH_IS_ASH(APPLET_ODDNAME(sh, ash, BB_DIR_BIN, BB_SUID_DROP, sh)) | |