kbuild: generate modules.builtin
PATCH 9/18 kbuild: generate modules.builtin
From: Michal Marek <[email protected]>
To make it easier for tools like mkinitrd to detect whether a needed module is missing or whether it is compiled into the kernel, install a modules.builtin file listing all modules built into the kernel. This is done by generating an alternate config file with all tristate =y options set to =Y and reading the makefiles with this config included. The built in modules then appear in obj-Y.
---
.gitignore | 1 Makefile | 14 +++++++-- scripts/Kbuild.include | 6 ++++ scripts/Makefile.lib | 5 ++- scripts/Makefile.modbuiltin | 48 ++++++++++++++++++++++++++++++++++ scripts/kconfig/confdata.c | 48 +++++++++++++++++++++++++++++----- 6 files changed, 110 insertions(+), 12 deletions(-)
.gitignore renamed from .gitignore~kbuild-generate-modulesbuiltin +1 -0
@@ -22,6 +22,7 @@ *.lst *.symtypes *.order +modules.builtin *.elf *.bin *.gz
Makefile renamed from Makefile~kbuild-generate-modulesbuiltin +10 -4
@@ -871,6 +871,9 @@ $(sort $(vmlinux-init) $(vmlinux-main)) PHONY += $(vmlinux-dirs) $(vmlinux-dirs): prepare scripts $(Q)$(MAKE) $(build)=$@ +ifdef CONFIG_MODULES + $(Q)$(MAKE) $(modbuiltin)=$@ +endif # Build the kernel release string #
@@ -1126,6 +1129,7 @@ all: modules PHONY += modules modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux) $(Q)$(AWK) '!x[$$0]++' $(vmlinux-dirs:%=$(objtree)/%/modules.order) > $(objtree)/modules.order + $(Q)$(AWK) '!x[$$0]++' $(vmlinux-dirs:%=$(objtree)/%/modules.builtin) > $(objtree)/modules.builtin @$(kecho) ' Building modules, stage 2.'; $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.fwinst obj=firmware __fw_modbuild
@@ -1154,7 +1158,7 @@ _modinst_: rm -f $(MODLIB)/build ; \ ln -s $(objtree) $(MODLIB)/build ; \ fi - @cp -f $(objtree)/modules.order $(MODLIB)/ + @cp -f $(objtree)/modules.{order,builtin} $(MODLIB)/ $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modinst # This depmod is only for convenience to give the initial
@@ -1217,8 +1221,9 @@ clean: archclean $(clean-dirs) \( -name '*.[oas]' -o -name '*.ko' -o -name '.*.cmd' \ -o -name '.*.d' -o -name '.*.tmp' -o -name '*.mod.c' \ -o -name '*.symtypes' -o -name 'modules.order' \ - -o -name 'Module.markers' -o -name '.tmp_*.o.*' \ - -o -name '*.gcno' \) -type f -print | xargs rm -f + -o -name 'modules.builtin' -o -name 'Module.markers' \ + -o -name '.tmp_*.o.*' -o -name '*.gcno' \) \ + -type f -print | xargs rm -f # mrproper - Delete all generated files, including .config #
@@ -1416,7 +1421,8 @@ $(clean-dirs): clean: rm-dirs := $(MODVERDIR) clean: rm-files := $(KBUILD_EXTMOD)/Module.symvers \ $(KBUILD_EXTMOD)/Module.markers \ - $(KBUILD_EXTMOD)/modules.order + $(KBUILD_EXTMOD)/modules.order \ + $(KBUILD_EXTMOD)/modules.builtin clean: $(clean-dirs) $(call cmd,rmdirs) $(call cmd,rmfiles)
scripts/Kbuild.include renamed from scripts/Kbuild.include~kbuild-generate-modulesbuiltin +6 -0
@@ -143,6 +143,12 @@ ld-option = $(call try-run,\ # $(Q)$(MAKE) $(build)=dir build := -f $(if $(KBUILD_SRC),$(srctree)/)scripts/Makefile.build obj +### +# Shorthand for $(Q)$(MAKE) -f scripts/Makefile.modbuiltin obj= +# Usage: +# $(Q)$(MAKE) $(modbuiltin)=dir +modbuiltin := -f $(if $(KBUILD_SRC),$(srctree)/)scripts/Makefile.modbuiltin obj + # Prefix -I with $(srctree) if it is not an absolute path. # skip if -I has no parameter addtree = $(if $(patsubst -I%,%,$(1)), \
scripts/Makefile.lib renamed from scripts/Makefile.lib~kbuild-generate-modulesbuiltin +4 -1
@@ -37,6 +37,8 @@ modorder := $(patsubst %/,%/modules.orde __subdir-y := $(patsubst %/,%,$(filter %/, $(obj-y))) subdir-y += $(__subdir-y) +__subdir-Y := $(patsubst %/,%,$(filter %/, $(obj-Y))) +subdir-Y += $(__subdir-Y) __subdir-m := $(patsubst %/,%,$(filter %/, $(obj-m))) subdir-m += $(__subdir-m) obj-y := $(patsubst %/, %/built-in.o, $(obj-y))
@@ -44,7 +46,7 @@ obj-m := $(filter-out %/, $(obj-m)) # Subdirectories we need to descend into -subdir-ym := $(sort $(subdir-y) $(subdir-m)) +subdir-ym := $(sort $(subdir-y) $(subdir-Y) $(subdir-m)) # if $(foo-objs) exists, foo.o is a composite object multi-used-y := $(sort $(foreach m,$(obj-y), $(if $(strip $($(m:.o=-objs)) $($(m:.o=-y))), $(m))))
@@ -76,6 +78,7 @@ always := $(addprefix $(obj)/,$(always) targets := $(addprefix $(obj)/,$(targets)) modorder := $(addprefix $(obj)/,$(modorder)) obj-y := $(addprefix $(obj)/,$(obj-y)) +obj-Y := $(addprefix $(obj)/,$(obj-Y)) obj-m := $(addprefix $(obj)/,$(obj-m)) lib-y := $(addprefix $(obj)/,$(lib-y)) subdir-obj-y := $(addprefix $(obj)/,$(subdir-obj-y))
scripts/Makefile.modbuiltin new file +48 -0
48 lines not on this page · raw message
scripts/kconfig/confdata.c renamed from scripts/kconfig/confdata.c~kbuild-generate-modulesbuiltin +41 -7
126 lines not on this page · raw message
_
Feedback on "kbuild: generate modules.builtin"
Quoted 8 lines · On Fri, Sep 18, 2009 at 12:49:29PM -0700, [email protected] wrote:
From: Michal Marek <[email protected]>
To make it easier for tools like mkinitrd to detect whether a needed module is missing or whether it is compiled into the kernel, install a modules.builtin file listing all modules built into the kernel. This is done by generating an alternate config file with all tristate =y options set to =Y and reading the makefiles with this config included. The built in modules then appear in obj-Y.
Hi Michael.
[Added Steven on cc: as he had done some kconfig
hacking lately].
Got some time (finally) to look at this.
I understand the functionality and I have myself had the need to see builtin modules.
As for the implmentation I have a few comments.
General comments:
1) Update to documentation is missing. AUTOCONFIG2 needs documentation (kconfig.txt) modules.builtin needs documetnation (kbuild.txt)
The latter is thin at the moment but thats not
any excuse.
2) auto2.conf is a full copy of auto.conf with a tristate symbols equals 'y' set to 'Y'. iI suggest to make it a list of tristate symbols. You can then do something like this:
include auto.conf
y := Y
include tristate-symbols.conf
y := yThis make it more general and you do not
have two almost identical files produced.
Some specific comments below.
Sam
Makefile $(sort $(vmlinux-init) $(vmlinux-main)) · line 876
Quoted 10 lines
diff -puN Makefile~kbuild-generate-modulesbuiltin
MakefileMakefile renamed from Makefile~kbuild-generate-modulesbuiltin +3
-0@@ -871,6 +871,9 @@ $(sort $(vmlinux-init) $(vmlinux-main)) PHONY += $(vmlinux-dirs) $(vmlinux-dirs): prepare scripts $(Q)$(MAKE) $(build)=$@ +ifdef CONFIG_MODULES + $(Q)$(MAKE) $(modbuiltin)=$@ +endif
The other stuff we run after a completed build is the target vmlinux: just above.
If there is no good reason not to do so please move it so we keep all these post processing steps in one place.
Makefile _modinst_: · line 1161
Quoted 3 lines
Makefile renamed from Makefile~kbuild-generate-modulesbuiltin +1
-1fi - @cp -f $(objtree)/modules.order $(MODLIB)/ + @cp -f $(objtree)/modules.{order,builtin} $(MODLIB)/
I assume this works with any shell?
scripts/Makefile.lib modorder := $(patsubst %/,%/modules.orde · line 41
Quoted 9 lines
diff -puN
scripts/Makefile.lib~kbuild-generate-modulesbuiltinscripts/Makefile.libscripts/Makefile.lib renamed from scripts/Makefile.lib~kbuild-generate-modulesbuiltin +2
-0@@ -37,6 +37,8 @@ modorder := $(patsubst %/,%/modules.orde __subdir-y := $(patsubst %/,%,$(filter %/, $(obj-y))) subdir-y += $(__subdir-y) +__subdir-Y := $(patsubst %/,%,$(filter %/, $(obj-Y))) +subdir-Y += $(__subdir-Y)
This is only used by Makefile.modbuiltin - move it there.
scripts/Makefile.lib obj-m := $(filter-out %/, $(obj-m)) · line 50
Quoted 10 lines
scripts/Makefile.lib renamed from scripts/Makefile.lib~kbuild-generate-modulesbuiltin +1
-1__subdir-m := $(patsubst %/,%,$(filter %/, $(obj-m))) subdir-m += $(__subdir-m) obj-y := $(patsubst %/, %/built-in.o, $(obj-y))@@ -44,7 +46,7 @@ obj-m := $(filter-out %/, $(obj-m)) # Subdirectories we need to descend into -subdir-ym := $(sort $(subdir-y) $(subdir-m)) +subdir-ym := $(sort $(subdir-y) $(subdir-Y) $(subdir-m))
This is only used by Makefile.modbuiltin - move it there.
(Makefile.lib is messy and need so love one day. No need to add more to the mess).
scripts/Makefile.lib always := $(addprefix $(obj)/,$(always) · line 81
Quoted 7 lines
scripts/Makefile.lib renamed from scripts/Makefile.lib~kbuild-generate-modulesbuiltin +1
-0# if $(foo-objs) exists, foo.o is a composite object multi-used-y := $(sort $(foreach m,$(obj-y), $(if $(strip $($(m:.o=-objs)) $($(m:.o=-y))), $(m))))@@ -76,6 +78,7 @@ always := $(addprefix $(obj)/,$(always) targets := $(addprefix $(obj)/,$(targets)) modorder := $(addprefix $(obj)/,$(modorder)) obj-y := $(addprefix $(obj)/,$(obj-y)) +obj-Y := $(addprefix $(obj)/,$(obj-Y))
ditto.
Quoted 32 lines
scripts/Makefile.lib renamed from scripts/Makefile.lib~kbuild-generate-modulesbuiltin +0
-0obj-m := $(addprefix $(obj)/,$(obj-m)) lib-y := $(addprefix $(obj)/,$(lib-y)) subdir-obj-y := $(addprefix $(obj)/,$(subdir-obj-y))diff -puN
/dev/nullscripts/Makefile.modbuiltinscripts/Makefile.modbuiltin new file +25
-0@@ -0,0 +1,48 @@ +# ========================================================================== +# Generating modules.builtin +# ========================================================================== + +src := $(obj) + +PHONY := __modbuiltin +__modbuiltin: + +# Read auto2.conf which sets tristate variables to 'Y' instead of 'y' +# That way, we get the list of built-in modules in obj-Y +-include include/config/auto2.conf + +include scripts/Kbuild.include + +# The filename Kbuild has precedence over Makefile +kbuild-dir := $(if $(filter /%,$(src)),$(src),$(srctree)/$(src)) +kbuild-file := $(if $(wildcard $(kbuild-dir)/Kbuild),$(kbuild-dir)/Kbuild,$(kbuild-dir)/Makefile) +include $(kbuild-file) + +include scripts/Makefile.lib + +modbuiltin-subdirs := $(patsubst %,%/modules.builtin, $(subdir-ym)) +modbuiltin-mods := $(filter %.ko, $(obj-Y:.o=.ko)) +modbuiltin-target := $(obj)/modules.builtin
scripts/Makefile.modbuiltin line 35
Quoted 10 lines
scripts/Makefile.modbuiltin new file +10
-0+ +__modbuiltin: $(modbuiltin-target) $(subdir-ym) + @: + +modbuiltin-cmds = \ + for m in $(modbuiltin-mods); do echo kernel/$$m; done; \ + cat /dev/null $(modbuiltin-subdirs); + +$(modbuiltin-target): $(subdir-ym) + $(Q)($(modbuiltin-cmds)) > $@
As Jan aleady noted in a follow-up patch "FORCE" is missing.
scripts/Makefile.modbuiltin line 48
Quoted 13 lines
scripts/Makefile.modbuiltin new file +13
-0+ +# Descending +# --------------------------------------------------------------------------- + +PHONY += $(subdir-ym) +$(subdir-ym): + $(Q)$(MAKE) $(modbuiltin)=$@ + + +# Declare the contents of the .PHONY variable as phony. We keep that +# information in a variable se we can use it in if_changed and friends. + +.PHONY: $(PHONY)
Well - except that I do not see any of these used. Keep like the above as this is what we do in other places.
Quoted 136 lines
diff -puN
scripts/kconfig/confdata.c~kbuild-generate-modulesbuiltinscripts/kconfig/confdata.cscripts/kconfig/confdata.c renamed from scripts/kconfig/confdata.c~kbuild-generate-modulesbuiltin +41
-7@@ -672,12 +672,27 @@ out:return res; } +int fprintf2 (FILE *f1,FILE *f2,const char *fmt, ...) +{ +va_list ap; +int res; + +va_start (ap, fmt); +vfprintf (f1, fmt, ap); +va_end (ap); +va_start (ap, fmt); + res =vfprintf (f2, fmt, ap); +va_end (ap); + +return res; +} +int conf_write_autoconf (void ) {struct symbol *sym;const char *str;const char *name; -FILE *out, *out_h; +FILE *out, *out2, *out_h;time_t now;int i, l;@@ -692,16 +707,23 @@ int conf_write_autoconf(void)if (!out)return 1 ; + out2 =fopen (".tmpconfig2" ,"w" ); +if (!out2) { +fclose (out); +return 1 ; + } + out_h =fopen (".tmpconfig.h" ,"w" );if (!out_h) {fclose (out); +fclose (out2);return 1 ; } sym =sym_lookup ("KERNELVERSION" ,0 );sym_calc_value (sym);time (&now); -fprintf (out,"#\n" +fprintf2 (out, out2,"#\n" "# Automatically generated make config: don't edit\n" "# Linux kernel version: %s\n" "# %s"@@ -726,45 +748,51 @@ int conf_write_autoconf(void)case no:break ;case mod: -fprintf (out,"CONFIG_%s=m\n" , sym->name); +fprintf2 (out, out2,"CONFIG_%s=m\n" , + sym->name);fprintf (out_h,"#define CONFIG_%s_MODULE 1\n" , sym->name);break ;case yes:fprintf (out,"CONFIG_%s=y\n" , sym->name); +fprintf (out2,"CONFIG_%s=%c\n" , sym->name, + sym->type ==S_BOOLEAN ?'y' :'Y' );fprintf (out_h,"#define CONFIG_%s 1\n" , sym->name);break ; }break ;case S_STRING : str =sym_get_string_value (sym); -fprintf (out,"CONFIG_%s=\"" , sym->name); +fprintf2 (out, out2,"CONFIG_%s=\"" , sym->name);fprintf (out_h,"#define CONFIG_%s \"" , sym->name);while (1 ) { l =strcspn (str,"\"\\" );if (l) {fwrite (str, l,1 , out); +fwrite (str, l,1 , out2);fwrite (str, l,1 , out_h); str += l; }if (!*str)break ; -fprintf (out,"\\%c" , *str); +fprintf2 (out, out2,"\\%c" , *str);fprintf (out_h,"\\%c" , *str); str++; }fputs ("\"\n" , out); +fputs ("\"\n" , out2);fputs ("\"\n" , out_h);break ;case S_HEX : str =sym_get_string_value (sym);if (str[0 ] !='0' || (str[1 ] !='x' && str[1 ] !='X' )) { -fprintf (out,"CONFIG_%s=%s\n" , sym->name, str); +fprintf2 (out, out2,"CONFIG_%s=%s\n" , + sym->name, str);fprintf (out_h,"#define CONFIG_%s 0x%s\n" , sym->name, str);break ; }case S_INT : str =sym_get_string_value (sym); -fprintf (out,"CONFIG_%s=%s\n" , sym->name, str); +fprintf2 (out, out2,"CONFIG_%s=%s\n" , sym->name, str);fprintf (out_h,"#define CONFIG_%s %s\n" , sym->name, str);break ;default :@@ -772,6 +800,7 @@ int conf_write_autoconf(void) } }fclose (out); +fclose (out2);fclose (out_h); name =getenv ("KCONFIG_AUTOHEADER" );@@ -779,6 +808,11 @@ int conf_write_autoconf(void) name ="include/linux/autoconf.h" ;if (rename (".tmpconfig.h" , name))return 1 ; + name =getenv ("KCONFIG_AUTOCONFIG2" ); +if (!name) + name ="include/config/auto2.conf" ; +if (rename (".tmpconfig2" , name)) +return 1 ; name =conf_get_autoconfig_name ();/* * This must be the last step, kbuild has a dependency on auto.conf _
Re: Feedback on "kbuild: generate modules.builtin"
Quoted 10 lines · Sam Ravnborg
Quoted 8 lines · On Fri, Sep 18, 2009 at 12:49:29PM -0700, [email protected] wrote:
From: Michal Marek <[email protected]>
To make it easier for tools like mkinitrd to detect whether a needed module is missing or whether it is compiled into the kernel, install a modules.builtin file listing all modules built into the kernel. This is done by generating an alternate config file with all tristate =y options set to =Y and reading the makefiles with this config included. The built in modules then appear in obj-Y.
Quoted 4 lines
Hi Michael.
[Added Steven on cc: as he had done some kconfig
hacking lately].
Thanks!
Quoted 2 lines
Got some time (finally) to look at this.
Unfortunately, I'm about to leave for two weeks. I got LinuxCon and LinuxPlumbers to present at in Portland, then I fly off to Dresden Germany to present at OSADL conference there. So I wont have anytime to look at this until I'm done with these.
But please, keep me posted on any changes like this.
Thanks,
-- Steve
Quoted 4 lines
I understand the functionality and I have myself had the need to see builtin modules.
As for the implmentation I have a few comments.
Re: Feedback on "kbuild: generate modules.builtin"
In reply to Sam RavnborgQuoted 3 lines
Got some time (finally) to look at this.
I understand the functionality and I have myself had the need to see builtin modules.
I just did a quick patch that address most of my comments. I'm heading out of the door in a few minutes
so I decided to post it despite Makefile.modbuiltin is not updated.
I went for a file named tristate.conf that includes all tristate symbols. Then we may use it for other purposes later.
And I kept the "=Y" syntax. In the end this is rather elegant.
They basic idea is to do:
-include include/config/auto.conf
-include include/config/tristate.conf
Where the latter assing new values to all
symbols that refer to builtin modules.
Notice how much simpler the changes to confdata are.
Sam
.gitignore +1 -0
@@ -22,6 +22,7 @@ *.lst *.symtypes *.order +modules.builtin *.elf *.bin *.gz
Makefile +10 -4
@@ -883,6 +883,9 @@ endef # vmlinux image - including updated kernel symbols vmlinux: $(vmlinux-lds) $(vmlinux-init) $(vmlinux-main) vmlinux.o $(kallsyms.o) FORCE +ifdef CONFIG_MODULES + $(Q)$(MAKE) $(modbuiltin)=$@ +endif ifdef CONFIG_HEADERS_CHECK $(Q)$(MAKE) -f $(srctree)/Makefile headers_check endif
@@ -1168,6 +1171,7 @@ all: modules PHONY += modules modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux) $(Q)$(AWK) '!x[$$0]++' $(vmlinux-dirs:%=$(objtree)/%/modules.order) > $(objtree)/modules.order + $(Q)$(AWK) '!x[$$0]++' $(vmlinux-dirs:%=$(objtree)/%/modules.builtin) > $(objtree)/modules.builtin @$(kecho) ' Building modules, stage 2.'; $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.fwinst obj=firmware __fw_modbuild
@@ -1196,7 +1200,7 @@ _modinst_: rm -f $(MODLIB)/build ; \ ln -s $(objtree) $(MODLIB)/build ; \ fi - @cp -f $(objtree)/modules.order $(MODLIB)/ + @cp -f $(objtree)/modules.{order,builtin} $(MODLIB)/ $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modinst # This depmod is only for convenience to give the initial
@@ -1259,8 +1263,9 @@ clean: archclean $(clean-dirs) \( -name '*.[oas]' -o -name '*.ko' -o -name '.*.cmd' \ -o -name '.*.d' -o -name '.*.tmp' -o -name '*.mod.c' \ -o -name '*.symtypes' -o -name 'modules.order' \ - -o -name 'Module.markers' -o -name '.tmp_*.o.*' \ - -o -name '*.gcno' \) -type f -print | xargs rm -f + -o -name 'modules.builtin' -o -name 'Module.markers' \ + -o -name '.tmp_*.o.*' -o -name '*.gcno' \) \ + -type f -print | xargs rm -f # mrproper - Delete all generated files, including .config #
@@ -1458,7 +1463,8 @@ $(clean-dirs): clean: rm-dirs := $(MODVERDIR) clean: rm-files := $(KBUILD_EXTMOD)/Module.symvers \ $(KBUILD_EXTMOD)/Module.markers \ - $(KBUILD_EXTMOD)/modules.order + $(KBUILD_EXTMOD)/modules.order \ + $(KBUILD_EXTMOD)/modules.builtin clean: $(clean-dirs) $(call cmd,rmdirs) $(call cmd,rmfiles)
scripts/Kbuild.include +6 -0
@@ -149,6 +149,12 @@ ld-option = $(call try-run,\ # $(Q)$(MAKE) $(build)=dir build := -f $(if $(KBUILD_SRC),$(srctree)/)scripts/Makefile.build obj +### +# Shorthand for $(Q)$(MAKE) -f scripts/Makefile.modbuiltin obj= +# Usage: +# $(Q)$(MAKE) $(modbuiltin)=dir +modbuiltin := -f $(if $(KBUILD_SRC),$(srctree)/)scripts/Makefile.modbuiltin obj + # Prefix -I with $(srctree) if it is not an absolute path. # skip if -I has no parameter addtree = $(if $(patsubst -I%,%,$(1)), \
scripts/kconfig/confdata.c +20 -1
@@ -677,7 +677,7 @@ int conf_write_autoconf(void)struct symbol *sym;const char *str;const char *name; -FILE *out, *out_h; +FILE *out, *tristate, *out_h;time_t now;int i, l;
@@ -692,9 +692,16 @@ int conf_write_autoconf(void)if (!out)return 1 ; + tristate =fopen (".tmpconfig_tristate" ,"w" ); +if (!tristate) { +fclose (out); +return 1 ; + } + out_h =fopen (".tmpconfig.h" ,"w" );if (!out_h) {fclose (out); +fclose (tristate);return 1 ; }
@@ -707,6 +714,9 @@ int conf_write_autoconf(void)"# %s" "#\n" , sym_get_string_value(sym), ctime(&now)); +fprintf (tristate,"#\n" +"# Automatically generated - do not edit\n" +"\n" );fprintf (out_h,"/*\n" " * Automatically generated C config: don't edit\n" " * Linux kernel version: %s\n"
@@ -727,10 +737,13 @@ int conf_write_autoconf(void)break ;case mod:fprintf (out,"CONFIG_%s=m\n" , sym->name); +fprintf (tristate,"CONFIG_%s=M\n" , sym->name);fprintf (out_h,"#define CONFIG_%s_MODULE 1\n" , sym->name);break ;case yes:fprintf (out,"CONFIG_%s=y\n" , sym->name); +fprintf (tristate,"CONFIG_%s=%c\n" , sym->name, + sym->type ==S_BOOLEAN ?'y' :'Y' );fprintf (out_h,"#define CONFIG_%s 1\n" , sym->name);break ; }
@@ -772,6 +785,7 @@ int conf_write_autoconf(void) } }fclose (out); +fclose (tristate);fclose (out_h); name =getenv ("KCONFIG_AUTOHEADER" );
@@ -779,6 +793,11 @@ int conf_write_autoconf(void) name ="include/linux/autoconf.h" ;if (rename (".tmpconfig.h" , name))return 1 ; + name =getenv ("KCONFIG_TRISTATE" ); +if (!name) + name ="include/config/tristate.conf" ; +if (rename (".tmpconfig_tristate" , name)) +return 1 ; name =conf_get_autoconfig_name ();/* * This must be the last step, kbuild has a dependency on auto.conf
Re: Feedback on "kbuild: generate modules.builtin"
In reply to Sam RavnborgSam Ravnborg napsal(a):
Quoted 10 lines · On Fri, Sep 18, 2009 at 12:49:29PM -0700, [email protected] wrote:
Quoted 8 lines
From: Michal Marek <[email protected]>
To make it easier for tools like mkinitrd to detect whether a needed module is missing or whether it is compiled into the kernel, install a modules.builtin file listing all modules built into the kernel. This is done by generating an alternate config file with all tristate =y options set to =Y and reading the makefiles with this config included. The built in modules then appear in obj-Y.
Quoted 8 lines
Hi Michael.
[Added Steven on cc: as he had done some kconfig
hacking lately].Got some time (finally) to look at this.
I understand the functionality and I have myself had the need to see builtin modules.
Hi Sam,
many thanks for the review and for the patch, I basically agree with all what you said, except this one:
Quoted 7 lines
Quoted 7 lines
diff -puN Makefile~kbuild-generate-modulesbuiltin
MakefileMakefile renamed from Makefile~kbuild-generate-modulesbuiltin +0
-0@@ -871,6 +871,9 @@ $(sort $(vmlinux-init) $(vmlinux-main)) PHONY += $(vmlinux-dirs) $(vmlinux-dirs): prepare scripts $(Q)$(MAKE) $(build)=$@
Quoted 8 lines
Makefile $(sort $(vmlinux-init) $(vmlinux-main)) · line 876
Quoted 3 lines
Makefile renamed from Makefile~kbuild-generate-modulesbuiltin +3
-0+ifdef CONFIG_MODULES + $(Q)$(MAKE) $(modbuiltin)=$@ +endifThe other stuff we run after a completed build is the target vmlinux: just above.
If there is no good reason not to do so please move it so we keep all these post processing steps in one place.
The reason is that I need to iterate over $(vmlinux-dirs) to descend into subdirectories like Makefile.build does. Putting the command here allows to just write $(MAKE) $(modbuiltin)=$@ and be done, in the vmlinux target I would have to do the iteration manually.
I'll provide an updated patch soon.
Michal