History

kbuild: drop $(objtree)/ prefix support for clean-files

I think this hack is a bad idea. arch/powerpc/boot/Makefile is the only and last user. Let's stop doing this.

Masahiro Yamada committed 4 years ago

Commit 8d613a11 parent 75ef3122 files · +3 −9Browse files

Unified · Split

2 files
  1. arch/powerpc/boot/Makefile +2 −2
  2. scripts/Makefile.clean +1 −7
arch/powerpc/boot/Makefile+2−2
@@ -453,8 +453,8 @@ clean-files += $(image-) $(initrd-) cuImage.* dtbImage.* treeImage.* \ · 452 unmodified lines
453clean-kernel-base := vmlinux.strip vmlinux.bin453clean-kernel-base := vmlinux.strip vmlinux.bin
454clean-kernel := $(addsuffix .gz,$(clean-kernel-base))454clean-kernel := $(addsuffix .gz,$(clean-kernel-base))
455clean-kernel += $(addsuffix .xz,$(clean-kernel-base))455clean-kernel += $(addsuffix .xz,$(clean-kernel-base))
456# If not absolute clean-files are relative to $(obj).456# clean-files are relative to $(obj).
457clean-files += $(addprefix $(objtree)/, $(clean-kernel))457clean-files += $(addprefix ../../../, $(clean-kernel))
458 458
459WRAPPER_OBJDIR := /usr/lib/kernel-wrapper459WRAPPER_OBJDIR := /usr/lib/kernel-wrapper
460WRAPPER_DTSDIR := /usr/lib/kernel-wrapper/dts460WRAPPER_DTSDIR := /usr/lib/kernel-wrapper/dts
scripts/Makefile.clean+1−7
@@ -36,13 +36,7 @@ __clean-files := \ · 35 unmodified lines
36 36
37__clean-files := $(filter-out $(no-clean-files), $(__clean-files))37__clean-files := $(filter-out $(no-clean-files), $(__clean-files))
38 38
39# clean-files is given relative to the current directory, unless it39__clean-files := $(wildcard $(addprefix $(obj)/, $(__clean-files)))
40# starts with $(objtree)/ (which means "./", so do not add "./" unless
41# you want to delete a file from the toplevel object directory).
42
43__clean-files := $(wildcard \
44 $(addprefix $(obj)/, $(filter-out $(objtree)/%, $(__clean-files))) \
45 $(filter $(objtree)/%, $(__clean-files)))
46 40
47# ==========================================================================41# ==========================================================================
48 42