aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorMichal Marek <mmarek@suse.cz>2010-08-04 07:59:13 -0400
committerMichal Marek <mmarek@suse.cz>2010-08-04 07:59:13 -0400
commit772320e84588dcbe1600ffb83e5f328f2209ac2a (patch)
treea7de21b79340aeaa17c58126f6b801b82c77b53a /Makefile
parent1ce53adf13a54375d2a5c7cdbe341b2558389615 (diff)
parent9fe6206f400646a2322096b56c59891d530e8d51 (diff)
Merge commit 'v2.6.35' into kbuild/kbuild
Conflicts: arch/powerpc/Makefile
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile14
1 files changed, 6 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index 7af9d547946..968ac2af763 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
1VERSION = 2 1VERSION = 2
2PATCHLEVEL = 6 2PATCHLEVEL = 6
3SUBLEVEL = 33 3SUBLEVEL = 35
4EXTRAVERSION = -rc6 4EXTRAVERSION =
5NAME = Man-Eating Seals of Antiquity 5NAME = Sheep on Meth
6 6
7# *DOCUMENTATION* 7# *DOCUMENTATION*
8# To see a list of typical targets execute "make help" 8# To see a list of typical targets execute "make help"
@@ -894,11 +894,9 @@ $(vmlinux-dirs): prepare scripts
894 $(Q)$(MAKE) $(build)=$@ 894 $(Q)$(MAKE) $(build)=$@
895 895
896# Store (new) KERNELRELASE string in include/config/kernel.release 896# Store (new) KERNELRELASE string in include/config/kernel.release
897localversion = $(shell $(CONFIG_SHELL) \
898 $(srctree)/scripts/setlocalversion $(srctree))
899include/config/kernel.release: include/config/auto.conf FORCE 897include/config/kernel.release: include/config/auto.conf FORCE
900 $(Q)rm -f $@ 898 $(Q)rm -f $@
901 $(Q)echo $(KERNELVERSION)$(localversion) > $@ 899 $(Q)echo "$(KERNELVERSION)$$($(CONFIG_SHELL) $(srctree)/scripts/setlocalversion $(srctree))" > $@
902 900
903 901
904# Things we need to do before we recursively start building the kernel 902# Things we need to do before we recursively start building the kernel
@@ -1037,7 +1035,7 @@ all: modules
1037# using awk while concatenating to the final file. 1035# using awk while concatenating to the final file.
1038 1036
1039PHONY += modules 1037PHONY += modules
1040modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux) 1038modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux) modules.builtin
1041 $(Q)$(AWK) '!x[$$0]++' $(vmlinux-dirs:%=$(objtree)/%/modules.order) > $(objtree)/modules.order 1039 $(Q)$(AWK) '!x[$$0]++' $(vmlinux-dirs:%=$(objtree)/%/modules.order) > $(objtree)/modules.order
1042 @$(kecho) ' Building modules, stage 2.'; 1040 @$(kecho) ' Building modules, stage 2.';
1043 $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost 1041 $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost
@@ -1059,7 +1057,7 @@ PHONY += modules_install
1059modules_install: _modinst_ _modinst_post 1057modules_install: _modinst_ _modinst_post
1060 1058
1061PHONY += _modinst_ 1059PHONY += _modinst_
1062_modinst_: modules.builtin 1060_modinst_:
1063 @if [ -z "`$(DEPMOD) -V 2>/dev/null | grep module-init-tools`" ]; then \ 1061 @if [ -z "`$(DEPMOD) -V 2>/dev/null | grep module-init-tools`" ]; then \
1064 echo "Warning: you may need to install module-init-tools"; \ 1062 echo "Warning: you may need to install module-init-tools"; \
1065 echo "See http://www.codemonkey.org.uk/docs/post-halloween-2.6.txt";\ 1063 echo "See http://www.codemonkey.org.uk/docs/post-halloween-2.6.txt";\