On Mon, May 10, 2010 at 06:24:24PM +0200, Nicolas Palix wrote: > Four targets are added. Each one generates a different > output kind: context, patch, org, report. > Every SmPL file in 'scripts/coccinelle' is given to the spatch frontend > (located in the 'scripts' directory), and applied to the entire > source tree. A little late feedback. IIRC all points raised at first review has been addressed - good. > > Signed-off-by: Nicolas Palix <npalix@xxxxxxx> > Signed-off-by: Julia Lawall <julia@xxxxxxx> > --- > MAINTAINERS | 10 ++++++++++ > Makefile | 20 ++++++++++++++++++-- The top-level Makefile is already in a very bad shape. Adding more stuff there is never good. How about adding some infrastructure to support the various tools? Something along these lines: All targets named %check will call a shell script: scripts/%check.sh "make help" will call a script named: scripts/helpcheck.sh helpcheck.sh will contain all the ugly details about help for the various targets. We need to rename a few seldomly used targets to do this. Sample patch for top-level Makefile: diff --git a/Makefile b/Makefile index efdc3d0..40bf83e 100644 --- a/Makefile +++ b/Makefile @@ -412,7 +412,7 @@ endif # of make so .config is not included in this case either (for *config). no-dot-config-targets := clean mrproper distclean \ - cscope TAGS tags help %docs check% \ + cscope TAGS tags help %docs %check \ include/linux/version.h headers_% \ kernelrelease kernelversion @@ -1024,10 +1024,6 @@ include/linux/version.h: $(srctree)/Makefile FORCE include/generated/utsrelease.h: include/config/kernel.release FORCE $(call filechk,utsrelease.h) -PHONY += headerdep -headerdep: - $(Q)find include/ -name '*.h' | xargs --max-args 1 scripts/headerdep.pl - # --------------------------------------------------------------------------- PHONY += depend dep @@ -1273,13 +1269,9 @@ help: echo ' (default: $(INSTALL_HDR_PATH))'; \ echo '' @echo 'Static analysers' - @echo ' checkstack - Generate a list of stack hogs' - @echo ' namespacecheck - Name space analysis on compiled kernel' - @echo ' versioncheck - Sanity check on version.h usage' - @echo ' includecheck - Check for duplicate included header files' + @$(CONFIG_SHELL)$(srctree)/scripts/helpcheck.sh @echo ' export_report - List the usages of all exported symbols' @echo ' headers_check - Sanity check on exported headers' - @echo ' headerdep - Detect inclusion cycles in headers'; \ echo '' @echo 'Kernel packaging:' @$(MAKE) $(build)=$(package-dir) help @@ -1427,20 +1419,10 @@ tags TAGS cscope: FORCE $(call cmd,tags) # Scripts to check various things for consistency +# Call a helper script in scripts/ to do the actual job # --------------------------------------------------------------------------- - -includecheck: - find * $(RCS_FIND_IGNORE) \ - -name '*.[hcS]' -type f -print | sort \ - | xargs $(PERL) -w $(srctree)/scripts/checkincludes.pl - -versioncheck: - find * $(RCS_FIND_IGNORE) \ - -name '*.[hcS]' -type f -print | sort \ - | xargs $(PERL) -w $(srctree)/scripts/checkversion.pl - -namespacecheck: - $(PERL) $(srctree)/scripts/namespace.pl +%check: + $(Q)$(CONFIG_SHELL)$(srctree)/scripts/$@.sh export_report: $(PERL) $(srctree)/scripts/export_report.pl @@ -1448,20 +1430,7 @@ export_report: endif #ifeq ($(config-targets),1) endif #ifeq ($(mixed-targets),1) -PHONY += checkstack kernelrelease kernelversion - -# UML needs a little special treatment here. It wants to use the host -# toolchain, so needs $(SUBARCH) passed to checkstack.pl. Everyone -# else wants $(ARCH), including people doing cross-builds, which means -# that $(SUBARCH) doesn't work here. -ifeq ($(ARCH), um) -CHECKSTACK_ARCH := $(SUBARCH) -else -CHECKSTACK_ARCH := $(ARCH) -endif -checkstack: - $(OBJDUMP) -d vmlinux $$(find . -name '*.ko') | \ - $(PERL) $(src)/scripts/checkstack.pl $(CHECKSTACK_ARCH) +PHONY += kernelrelease kernelversion kernelrelease: $(if $(wildcard include/config/kernel.release), $(Q)echo $(KERNELRELEASE), \ A nice simplification of the top-level Mkefile. and an opportunity to document some of the magic shell commands used by the various tools. If we do this I know the scripts will sum up to a lot more lines but doing it distributed is better. And some of the lines would be comments that explains what is going on. An additinal benefit is that we can avoid touching the top-level Makefile next time we add a new %check target. As for cocci this would have the the effect that new scipts can be made as drop-in - no changes in any files. Just add the files to the correct directory. Sam -- To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
