forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

kbuild: Fix removal of the debian/ directory

Browse source 
scripts/Makefile.clean treats absolute path specially, but
$(objtree)/debian is no longer an absolute path since 7e1c0477 (kbuild:
Use relative path for $(objtree). Work around this by checking if the
path starts with $(objtree)/.

Reported-and-tested-by: Sedat Dilek <sedat.dilek@gmail.com>
Fixes: 7e1c0477 (kbuild: Use relative path for $(objtree)
Signed-off-by: Michal Marek <mmarek@suse.cz>
This commit is contained in:
Michal Marek 2014-12-31 16:29:35 +01:00
commit a16c5f99a2
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
scripts/Makefile.clean
View file

@ -42,19 +42,19 @@ __clean-files := $(extra-y) $(extra-m) $(extra-) \
__clean-files := $(filter-out $(no-clean-files), $(__clean-files)) __clean-files := $(filter-out $(no-clean-files), $(__clean-files))
# as clean-files is given relative to the current directory, this adds # clean-files is given relative to the current directory, unless it
# a $(obj) prefix, except for absolute paths # starts with $(objtree)/ (which means "./", so do not add "./" unless
# you want to delete a file from the toplevel object directory).
__clean-files := $(wildcard \ __clean-files := $(wildcard \
$(addprefix $(obj)/, $(filter-out /%, $(__clean-files))) \ $(addprefix $(obj)/, $(filter-out $(objtree)/%, $(__clean-files))) \
$(filter /%, $(__clean-files))) $(filter $(objtree)/%, $(__clean-files)))
# as clean-dirs is given relative to the current directory, this adds # same as clean-files
# a $(obj) prefix, except for absolute paths
__clean-dirs := $(wildcard \ __clean-dirs := $(wildcard \
$(addprefix $(obj)/, $(filter-out /%, $(clean-dirs))) \ $(addprefix $(obj)/, $(filter-out $(objtree)/%, $(clean-dirs))) \
$(filter /%, $(clean-dirs))) $(filter $(objtree)/%, $(clean-dirs)))
# ========================================================================== # ==========================================================================