x86: fix make mrproper

Michael Opdenacker reported:

For backward compatibility with earlier (< 2.6.24) kernels,
arch/i386/boot/bzImage or arch/x86_64/boot/bzImage symbolic links to
arch/x86/boot/bzImage are created when you build an x86 kernel. The
arch/i386 or arch/x86_64 directories are then created for this only
purpose.

Issue: these generated directories and symbolic links are *not cleaned
up* when you run "make mrproper" (and thus "make distclean"). This
disturbs the production of patches, because the source tree is left with
generated files and directories.

Sam has an alternative fix:

The directory is killed during make clean as opposed to make mrproper.

Reported-by: Michael Opdenacker <michael-lists@free-electrons.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

diff --git a/arch/x86/Makefile_32 b/arch/x86/Makefile_32
index 50394da2f6c122da4bac4234a4c6ad41d7dc83e3..f806ceccff7a5944936778ad505fd7bd713996f1 100644 (file)
--- a/arch/x86/Makefile_32
+++ b/arch/x86/Makefile_32
@@ -156,7 +156,8 @@ install:
        $(Q)$(MAKE) $(build)=$(boot) BOOTIMAGE=$(KBUILD_IMAGE) install
 
 archclean:
-       $(Q)rm -rf $(objtree)/arch/i386/boot
+       $(Q)rm -rf $(objtree)/arch/i386
+       $(Q)rm -rf $(objtree)/arch/x86_64
        $(Q)$(MAKE) $(clean)=arch/x86/boot
 
 define archhelp

diff --git a/arch/x86/Makefile_64 b/arch/x86/Makefile_64
index a804860022e65a7ec6c5f71a81b7011d0cee6852..93cf17769ff5dc2fcb717f489726a3c1a79b92d7 100644 (file)
--- a/arch/x86/Makefile_64
+++ b/arch/x86/Makefile_64
@@ -123,7 +123,8 @@ endif
        $(Q)$(MAKE) $(build)=arch/x86/vdso $@
 
 archclean:
-       $(Q)rm -rf $(objtree)/arch/x86_64/boot
+       $(Q)rm -rf $(objtree)/arch/i386
+       $(Q)rm -rf $(objtree)/arch/x86_64
        $(Q)$(MAKE) $(clean)=$(boot)
 
 define archhelp