aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-08-14 13:14:29 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2014-08-14 13:14:29 -0400
commit899552d6e84babd24611fd36ac7051068cb1eb2d (patch)
tree9a02d66b74a0a9267bbf6637765517f5e8558497 /Makefile
parent3b7b3e6ec5f56118046594d3c62469e7d1d0aadd (diff)
parent5a5da78b3a48120d942c8a18ecc645f6acdf7da6 (diff)
Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
Pull misc kbuild updates from Michal Marek: "This is the non-critical part of kbuild for 3.17-rc1: - make help hint to use make -s with make kernelrelease et al. - moved a kbuild document to Documentation/kbuild where it belongs - four new Coccinelle scripts, one dropped and one fixed - new make kselftest target to run various tests on the kernel" * 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild: kbuild: kselftest - new make target to build and run kernel selftests Coccinelle: Script to replace if and BUG with BUG_ON Coccinelle: Script to detect incorrect argument to sizeof Coccinelle: Script to use ARRAY_SIZE instead of division of two sizeofs Coccinelle: Script to detect cast after memory allocation coccinelle/null: solve parse error Documentation: headers_install.txt is part of kbuild kbuild: make -s should be used with kernelrelease/kernelversion/image_name
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile18
1 files changed, 15 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index ada00f0d2a11..6aace6750567 100644
--- a/Makefile
+++ b/Makefile
@@ -1064,6 +1064,13 @@ headers_check: headers_install
1064 $(Q)$(MAKE) $(hdr-inst)=arch/$(hdr-arch)/include/uapi/asm $(hdr-dst) HDRCHECK=1 1064 $(Q)$(MAKE) $(hdr-inst)=arch/$(hdr-arch)/include/uapi/asm $(hdr-dst) HDRCHECK=1
1065 1065
1066# --------------------------------------------------------------------------- 1066# ---------------------------------------------------------------------------
1067# Kernel selftest
1068
1069PHONY += kselftest
1070kselftest:
1071 $(Q)$(MAKE) -C tools/testing/selftests run_tests
1072
1073# ---------------------------------------------------------------------------
1067# Modules 1074# Modules
1068 1075
1069ifdef CONFIG_MODULES 1076ifdef CONFIG_MODULES
@@ -1250,9 +1257,9 @@ help:
1250 @echo ' tags/TAGS - Generate tags file for editors' 1257 @echo ' tags/TAGS - Generate tags file for editors'
1251 @echo ' cscope - Generate cscope index' 1258 @echo ' cscope - Generate cscope index'
1252 @echo ' gtags - Generate GNU GLOBAL index' 1259 @echo ' gtags - Generate GNU GLOBAL index'
1253 @echo ' kernelrelease - Output the release version string' 1260 @echo ' kernelrelease - Output the release version string (use with make -s)'
1254 @echo ' kernelversion - Output the version stored in Makefile' 1261 @echo ' kernelversion - Output the version stored in Makefile (use with make -s)'
1255 @echo ' image_name - Output the image name' 1262 @echo ' image_name - Output the image name (use with make -s)'
1256 @echo ' headers_install - Install sanitised kernel headers to INSTALL_HDR_PATH'; \ 1263 @echo ' headers_install - Install sanitised kernel headers to INSTALL_HDR_PATH'; \
1257 echo ' (default: $(INSTALL_HDR_PATH))'; \ 1264 echo ' (default: $(INSTALL_HDR_PATH))'; \
1258 echo '' 1265 echo ''
@@ -1266,6 +1273,11 @@ help:
1266 @echo ' headerdep - Detect inclusion cycles in headers' 1273 @echo ' headerdep - Detect inclusion cycles in headers'
1267 @$(MAKE) -f $(srctree)/scripts/Makefile.help checker-help 1274 @$(MAKE) -f $(srctree)/scripts/Makefile.help checker-help
1268 @echo '' 1275 @echo ''
1276 @echo 'Kernel selftest'
1277 @echo ' kselftest - Build and run kernel selftest (run as root)'
1278 @echo ' Build, install, and boot kernel before'
1279 @echo ' running kselftest on it'
1280 @echo ''
1269 @echo 'Kernel packaging:' 1281 @echo 'Kernel packaging:'
1270 @$(MAKE) $(build)=$(package-dir) help 1282 @$(MAKE) $(build)=$(package-dir) help
1271 @echo '' 1283 @echo ''