diff options
| author | Arnaud Lacombe <lacombar@gmail.com> | 2011-07-01 18:13:03 -0400 |
|---|---|---|
| committer | Arnaud Lacombe <lacombar@gmail.com> | 2011-08-08 01:44:27 -0400 |
| commit | 50bce3e80773e06316fcb92796ff26b42348d30b (patch) | |
| tree | a5aff2edb39f4047a7b37356bdf730f291ecccbb /scripts | |
| parent | 22d550ae83603aa8d64d72dd1e2309cd7a96ac89 (diff) | |
kconfig/streamline_config.pl: merge local{mod,yes}config
The two targets `localmodconfig' and `localyesconfig' only differs from the
sed(1) ran on the result of `streamline_config.pl' to convert symbols set to
`modules' to `yes'. This conversion can be made directly from the perl script,
and thus avoid duplicating the command to generate the configuration.
Cc: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: Arnaud Lacombe <lacombar@gmail.com>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/kconfig/Makefile | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile index 4de89738827c..ba573fe7c74d 100644 --- a/scripts/kconfig/Makefile +++ b/scripts/kconfig/Makefile | |||
| @@ -33,7 +33,7 @@ silentoldconfig: $(obj)/conf | |||
| 33 | $(Q)mkdir -p include/generated | 33 | $(Q)mkdir -p include/generated |
| 34 | $< --$@ $(Kconfig) | 34 | $< --$@ $(Kconfig) |
| 35 | 35 | ||
| 36 | localmodconfig: $(obj)/streamline_config.pl $(obj)/conf | 36 | localyesconfig localmodconfig: $(obj)/streamline_config.pl $(obj)/conf |
| 37 | $(Q)mkdir -p include/generated | 37 | $(Q)mkdir -p include/generated |
| 38 | $(Q)perl $< --$@ $(srctree) $(Kconfig) > .tmp.config | 38 | $(Q)perl $< --$@ $(srctree) $(Kconfig) > .tmp.config |
| 39 | $(Q)if [ -f .config ]; then \ | 39 | $(Q)if [ -f .config ]; then \ |
| @@ -48,22 +48,6 @@ localmodconfig: $(obj)/streamline_config.pl $(obj)/conf | |||
| 48 | fi | 48 | fi |
| 49 | $(Q)rm -f .tmp.config | 49 | $(Q)rm -f .tmp.config |
| 50 | 50 | ||
| 51 | localyesconfig: $(obj)/streamline_config.pl $(obj)/conf | ||
| 52 | $(Q)mkdir -p include/generated | ||
| 53 | $(Q)perl $< --$@ $(srctree) $(Kconfig) > .tmp.config | ||
| 54 | $(Q)sed -i s/=m/=y/ .tmp.config | ||
| 55 | $(Q)if [ -f .config ]; then \ | ||
| 56 | cmp -s .tmp.config .config || \ | ||
| 57 | (mv -f .config .config.old.1; \ | ||
| 58 | mv -f .tmp.config .config; \ | ||
| 59 | $(obj)/conf --silentoldconfig $(Kconfig); \ | ||
| 60 | mv -f .config.old.1 .config.old) \ | ||
| 61 | else \ | ||
| 62 | mv -f .tmp.config .config; \ | ||
| 63 | $(obj)/conf --silentoldconfig $(Kconfig); \ | ||
| 64 | fi | ||
| 65 | $(Q)rm -f .tmp.config | ||
| 66 | |||
| 67 | # Create new linux.pot file | 51 | # Create new linux.pot file |
| 68 | # Adjust charset to UTF-8 in .po file to accept UTF-8 in Kconfig files | 52 | # Adjust charset to UTF-8 in .po file to accept UTF-8 in Kconfig files |
| 69 | # The symlink is used to repair a deficiency in arch/um | 53 | # The symlink is used to repair a deficiency in arch/um |