diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-08 04:46:50 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-08 04:46:50 +0200 |
| commit | 1ff5e37e727be2f575d1a672a1bc4c2595b4752e (patch) | |
| tree | 7a64165d7ca0f1dc813d98efcbe4898e28a8cdc1 /Makefile | |
| parent | lockref: add ability to mark lockrefs "dead" (diff) | |
| parent | kbuild: Do not overwrite include/config/kernel.release needlessly (diff) | |
| download | linux-1ff5e37e727be2f575d1a672a1bc4c2595b4752e.tar.xz linux-1ff5e37e727be2f575d1a672a1bc4c2595b4752e.zip | |
Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
Pull kbuild update from Michal Marek:
"Only these two commits are in the kbuild branch this time:
- Using filechk for include/config/kernel.release
- Cleanup in scripts/sortextable.c"
* 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
kbuild: Do not overwrite include/config/kernel.release needlessly
scripts: remove unused function in sortextable.c
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -794,10 +794,13 @@ PHONY += $(vmlinux-dirs) $(vmlinux-dirs): prepare scripts $(Q)$(MAKE) $(build)=$@ +define filechk_kernel.release + echo "$(KERNELVERSION)$$($(CONFIG_SHELL) $(srctree)/scripts/setlocalversion $(srctree))" +endef + # Store (new) KERNELRELEASE string in include/config/kernel.release include/config/kernel.release: include/config/auto.conf FORCE - $(Q)rm -f $@ - $(Q)echo "$(KERNELVERSION)$$($(CONFIG_SHELL) $(srctree)/scripts/setlocalversion $(srctree))" > $@ + $(call filechk,kernel.release) # Things we need to do before we recursively start building the kernel |