From 9484b1eb4d05957d3114dc63026448eb66106c06 Mon Sep 17 00:00:00 2001 From: Sam Ravnborg Date: Wed, 30 Jan 2008 13:30:04 +0100 Subject: [PATCH] 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 Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner --- arch/x86/Makefile_32 | 3 ++- arch/x86/Makefile_64 | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/x86/Makefile_32 b/arch/x86/Makefile_32 index 50394da2f6c..f806ceccff7 100644 --- 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 a804860022e..93cf17769ff 100644 --- 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