[PATCH 1/2] Revert "kexec: purgatory: add clean-up for purgatory directory"

From: Masahiro Yamada
Date: Tue Jun 19 2018 - 05:45:53 EST


This reverts commit b0108f9e93d0d39050eaa11358852f349bdccb71.

Commit b0108f9e93d0 ("kexec: purgatory: add clean-up for purgatory
directory") stated that the kexec-purgatory.c and purgatory.ro files
were not removed after make mrproper.

In fact, they are. You can confirm it after reverting it.

$ make mrproper
$ touch arch/x86/purgatory/kexec-purgatory.c
$ touch arch/x86/purgatory/purgatory.ro
$ make mrproper
CLEAN arch/x86/purgatory
$ ls arch/x86/purgatory/
entry64.S Makefile purgatory.c setup-x86_64.S stack.S string.c

This is obvious from the build system point of view.

arch/x86/Makefile adds 'arch/x86' to core-y.
Hence 'make clean' descends like this:

arch/x86/Kbuild
-> arch/x86/purgatory/Makefile

Signed-off-by: Masahiro Yamada <yamada.masahiro@xxxxxxxxxxxxx>
---

arch/x86/Makefile | 1 -
1 file changed, 1 deletion(-)

diff --git a/arch/x86/Makefile b/arch/x86/Makefile
index f0a6ea2..246a979 100644
--- a/arch/x86/Makefile
+++ b/arch/x86/Makefile
@@ -327,7 +327,6 @@ archclean:
$(Q)rm -rf $(objtree)/arch/x86_64
$(Q)$(MAKE) $(clean)=$(boot)
$(Q)$(MAKE) $(clean)=arch/x86/tools
- $(Q)$(MAKE) $(clean)=arch/x86/purgatory

define archhelp
echo '* bzImage - Compressed kernel image (arch/x86/boot/bzImage)'
--
2.7.4