2013-05-31 10:14:32

by Ian Campbell

Subject: [PATCH] kbuild: make sure we clean up DTB temporary files

Various temporary files used when building DTB files were not suffixed with
.tmp and therefore were not cleaned up by "make clean".

Signed-off-by: Ian Campbell <[email protected]>
Cc: Michal Marek <[email protected]>
Cc: Stephen Warren <[email protected]>
Cc: Rob Herring <[email protected]>
Cc: Grant Likely <[email protected]>
Cc: [email protected]
Cc: [email protected]
---
scripts/Makefile.lib | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index 51bb3de..d7ec7cf 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -149,7 +149,7 @@ cpp_flags = -Wp,-MD,$(depfile) $(NOSTDINC_FLAGS) $(LINUXINCLUDE) \

ld_flags = $(LDFLAGS) $(ldflags-y)

-dtc_cpp_flags = -Wp,-MD,$(depfile).pre -nostdinc \
+dtc_cpp_flags = -Wp,-MD,$(depfile).pre.tmp -nostdinc \
-I$(srctree)/arch/$(SRCARCH)/boot/dts \
-I$(srctree)/arch/$(SRCARCH)/boot/dts/include \
-undef -D__DTS__
@@ -265,13 +265,13 @@ quiet_cmd_dtc = DTC $@
cmd_dtc = $(CPP) $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) $< ; \
$(objtree)/scripts/dtc/dtc -O dtb -o $@ -b 0 \
-i $(srctree)/arch/$(SRCARCH)/boot/dts $(DTC_FLAGS) \
- -d $(depfile).dtc $(dtc-tmp) ; \
- cat $(depfile).pre $(depfile).dtc > $(depfile)
+ -d $(depfile).dtc.tmp $(dtc-tmp) ; \
+ cat $(depfile).pre.tmp $(depfile).dtc.tmp > $(depfile)

$(obj)/%.dtb: $(src)/%.dts FORCE
$(call if_changed_dep,dtc)

-dtc-tmp = $(subst $(comma),_,$(dot-target).dts)
+dtc-tmp = $(subst $(comma),_,$(dot-target).dts.tmp)

# Bzip2
# ---------------------------------------------------------------------------
--
1.7.10.4

2013-05-31 17:27:26

by Stephen Warren

Subject: Re: [PATCH] kbuild: make sure we clean up DTB temporary files

On 05/31/2013 04:14 AM, Ian Campbell wrote:
> Various temporary files used when building DTB files were not suffixed with
> .tmp and therefore were not cleaned up by "make clean".

Reviewed-by: Stephen Warren <[email protected]>
Tested-by: Stephen Warren <[email protected]>

2013-05-31 22:21:47

by Grant Likely

Subject: Re: [PATCH] kbuild: make sure we clean up DTB temporary files

On Fri, 31 May 2013 11:27:16 -0600, Stephen Warren <[email protected]> wrote:
> On 05/31/2013 04:14 AM, Ian Campbell wrote:
> > Various temporary files used when building DTB files were not suffixed with
> > .tmp and therefore were not cleaned up by "make clean".
>
> Reviewed-by: Stephen Warren <[email protected]>
> Tested-by: Stephen Warren <[email protected]>

Merged, thanks.

g.