diff options
| author | Andrew Morton <akpm@osdl.org> | 2004-06-23 19:24:10 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-06-23 19:24:10 -0700 |
| commit | 11e4e1e82c3de5869bfe18a46e2718cbdf586929 (patch) | |
| tree | ebf482aeb921b924d16f397c3abaf668bded3cf5 /kernel/Makefile | |
| parent | 3224bf995b3a18f3c5b47fcb39ca1cc2caf143cf (diff) | |
[PATCH] consolidate in-kernel configuration
From: Andy Whitcroft <apw@shadowen.org>
Being able to recover the configuration from a kernel is very useful and it
would be nice to default this option to Yes. Currently, to have the config
available both from the image (using extract-ikconfig) and via /proc we
keep two copies of the original .config in the kernel. One in plain text
and one gzip compressed. This is not optimal.
This patch removes the plain text version of the configuration and updates
the extraction tools to locate and use the gzip'd version of the file.
This has the added bonus of providing us with the exact same results in
both cases, the original .config; including the comments.
Signed-off-by: Andy Whitcroft <apw@shadowen.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'kernel/Makefile')
| -rw-r--r-- | kernel/Makefile | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/kernel/Makefile b/kernel/Makefile index 2b7b352b1a38..47f98594e9e5 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -33,23 +33,7 @@ ifneq ($(CONFIG_IA64),y) CFLAGS_sched.o := $(PROFILING) -fno-omit-frame-pointer endif -# configs.o uses generated files - dependecies must be listed explicitly -$(obj)/configs.o: $(obj)/ikconfig.h - -ifdef CONFIG_IKCONFIG_PROC $(obj)/configs.o: $(obj)/config_data.h -endif - -# ikconfig.h contains all the selected config entries - generated -# from top-level Makefile and .config. Info from ikconfig.h can -# be extracted from the kernel binary. - -quiet_cmd_ikconfig = IKCFG $@ - cmd_ikconfig = $(CONFIG_SHELL) $< .config $(srctree)/Makefile > $@ - -targets += ikconfig.h -$(obj)/ikconfig.h: scripts/mkconfigs .config $(srctree)/Makefile FORCE - $(call if_changed,ikconfig) # config_data.h contains the same information as ikconfig.h but gzipped. # Info from config_data can be extracted from /proc/config* @@ -58,7 +42,7 @@ $(obj)/config_data.gz: .config FORCE $(call if_changed,gzip) quiet_cmd_ikconfiggz = IKCFG $@ - cmd_ikconfiggz = cat $< | scripts/bin2c kernel_config_data > $@ + cmd_ikconfiggz = (echo "const char kernel_config_data[] = MAGIC_START"; cat $< | scripts/bin2c; echo "MAGIC_END;") > $@ targets += config_data.h $(obj)/config_data.h: $(obj)/config_data.gz FORCE $(call if_changed,ikconfiggz) |