Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bd1ee804 authored by Pawel Moll's avatar Pawel Moll Committed by Michal Marek
Browse files

kbuild: Do not remove vmlinux when cleaning external module 



Since commit 1f2bfbd0 "kbuild:
link of vmlinux moved to a script" make clean with M=<dir>
argument (so cleaning external module) removes vmlinux,
System.map and couple of other files from the *main* kernel
build directory! This not what was happening before and almost
certainly not what one would expect.

This patch moves makes the clean target of the script called
only when !KBUILD_EXTMOD.

Signed-off-by: default avatarPawel Moll <pawel.moll@arm.com>
Cc: stable@vger.kernel.org [v3.5+]
Signed-off-by: default avatarMichal Marek <mmarek@suse.cz>
parent fc96b211

Makefile

+5 −3
Original line number Diff line number Diff line
@@ -1008,11 +1008,14 @@ clean: rm-dirs := $(CLEAN_DIRS) 
clean: rm-files := $(CLEAN_FILES)

clean-dirs      := $(addprefix _clean_, . $(vmlinux-alldirs) Documentation samples)



PHONY += $(clean-dirs) clean archclean

PHONY += $(clean-dirs) clean archclean vmlinuxclean

$(clean-dirs):

	$(Q)$(MAKE) $(clean)=$(patsubst _clean_%,%,$@)



clean: archclean

vmlinuxclean:

	$(Q)$(CONFIG_SHELL) $(srctree)/scripts/link-vmlinux.sh clean



clean: archclean vmlinuxclean



# mrproper - Delete all generated files, including .config

#
@@ -1239,7 +1242,6 @@ scripts: ; 
endif # KBUILD_EXTMOD



clean: $(clean-dirs)

	$(Q)$(CONFIG_SHELL) $(srctree)/scripts/link-vmlinux.sh clean

	$(call cmd,rmdirs)

	$(call cmd,rmfiles)

	@find $(if $(KBUILD_EXTMOD), $(KBUILD_EXTMOD), .) $(RCS_FIND_IGNORE) \