From 99abfeafb5f2eea1bb481330ff37343e1133c924 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Wed, 24 Jan 2007 18:19:28 -0800 Subject: Linux 2.6.20-rc6 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 477f52e3c7f..9e1adac8aa2 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 20 -EXTRAVERSION =-rc5 +EXTRAVERSION =-rc6 NAME = Homicidal Dwarf Hamster # *DOCUMENTATION* -- cgit v1.2.3 From 59df3230fc57fa8900bebf3d2d68221d549f3c7c Mon Sep 17 00:00:00 2001 From: Geert Uytterhoeven Date: Mon, 29 Jan 2007 13:47:01 +0100 Subject: [PATCH] `make help' in build tree doesn't show headers_* targets `make help' in the build tree doesn't show the help texts about the `headers_install' and `headers_check' targets because it looks for include/asm-$(ARCH)/Kbuild in the wrong place. Add the missing `$(srctree)' prefixes to fix this. Also move the printing of the default install path for the headers inside the `if/fi', where it belongs. Signed-off-by: Geert Uytterhoeven Acked-by: Oleg Verych Signed-off-by: Linus Torvalds --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 9e1adac8aa2..59aa9f56fdb 100644 --- a/Makefile +++ b/Makefile @@ -1116,15 +1116,15 @@ help: @echo ' cscope - Generate cscope index' @echo ' kernelrelease - Output the release version string' @echo ' kernelversion - Output the version stored in Makefile' - @if [ -r include/asm-$(ARCH)/Kbuild ]; then \ + @if [ -r $(srctree)/include/asm-$(ARCH)/Kbuild ]; then \ echo ' headers_install - Install sanitised kernel headers to INSTALL_HDR_PATH'; \ + echo ' (default: $(INSTALL_HDR_PATH))'; \ fi - @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' - @if [ -r include/asm-$(ARCH)/Kbuild ]; then \ + @if [ -r $(srctree)/include/asm-$(ARCH)/Kbuild ]; then \ echo ' headers_check - Sanity check on exported headers'; \ fi @echo '' -- cgit v1.2.3 From f56df2f4db6e4af87fb8e941cff69f4501a111df Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Tue, 30 Jan 2007 19:42:57 -0800 Subject: Linux 2.6.20-rc7 Ok, so I said there wouldn't be another -rc. I lied. Signed-off-by: Linus Torvalds --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 59aa9f56fdb..75adfb53997 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 20 -EXTRAVERSION =-rc6 +EXTRAVERSION =-rc7 NAME = Homicidal Dwarf Hamster # *DOCUMENTATION* -- cgit v1.2.3 From 62d0cfcb27cf755cebdc93ca95dabc83608007cd Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Sun, 4 Feb 2007 10:44:54 -0800 Subject: Linux 2.6.20 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 75adfb53997..7e2750f4ca7 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 20 -EXTRAVERSION =-rc7 +EXTRAVERSION = NAME = Homicidal Dwarf Hamster # *DOCUMENTATION* -- cgit v1.2.3