| Message ID | 63006311fbb5c04b64efeade644d62a95e0a7709.1529294261.git.baruch@tkos.co.il |
|---|---|
| State | Superseded |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | [U-Boot] Makefile: drop mention of *.cfgtmp | expand |
On Mon, 2018-06-18 at 06:57 +0300, Baruch Siach wrote: > Since commit f916757300 (imx: Create distinct pre-processed mkimage > config files), *.cfgtmp files are no longer generated. There is no need > to remove them on the 'clean' target anymore. > > Remove also the .gitignore glob. I didn't think of the gitignore file when I did that patch. While I did stop generating .cfgtmp files, I replaced them with .cfgout files. So the gitignore patch should really be a s/cfgtmp/cfgout/ I think. It shouldn't be necessary to add *.cfgout to the find command since they are added to the target list and cleaned that way.
Hi Trent, On Wed, Jun 20, 2018 at 05:51:28PM +0000, Trent Piepho wrote: > On Mon, 2018-06-18 at 06:57 +0300, Baruch Siach wrote: > > Since commit f916757300 (imx: Create distinct pre-processed mkimage > > config files), *.cfgtmp files are no longer generated. There is no need > > to remove them on the 'clean' target anymore. > > > > Remove also the .gitignore glob. > > I didn't think of the gitignore file when I did that patch. While I > did stop generating .cfgtmp files, I replaced them with .cfgout files. > So the gitignore patch should really be a s/cfgtmp/cfgout/ I think. > > It shouldn't be necessary to add *.cfgout to the find command since > they are added to the target list and cleaned that way. Thanks for reviewing. I only build U-Boot with SPL that uses .cfgout from the spl/ directory which is in .gitignore already. But standalone .imx images use .cfgout from the top-level directory. So a *.cfgout in .gitignore is indeed needed. I'll update and resubmit. baruch
diff --git a/.gitignore b/.gitignore index 9110eda6468f..f97838a756a6 100644 --- a/.gitignore +++ b/.gitignore @@ -20,7 +20,6 @@ *.swp *.bin *.patch -*.cfgtmp *.tab.[ch] # host programs on Cygwin diff --git a/Makefile b/Makefile index 6a190e7a894b..61ef84576afa 100644 --- a/Makefile +++ b/Makefile @@ -1613,13 +1613,12 @@ PHONY += $(clean-dirs) clean archclean $(clean-dirs): $(Q)$(MAKE) $(clean)=$(patsubst _clean_%,%,$@) -# TODO: Do not use *.cfgtmp clean: $(clean-dirs) $(call cmd,rmdirs) $(call cmd,rmfiles) @find $(if $(KBUILD_EXTMOD), $(KBUILD_EXTMOD), .) $(RCS_FIND_IGNORE) \ \( -name '*.[oas]' -o -name '*.ko' -o -name '.*.cmd' \ - -o -name '*.ko.*' -o -name '*.su' -o -name '*.cfgtmp' \ + -o -name '*.ko.*' -o -name '*.su' \ -o -name '.*.d' -o -name '.*.tmp' -o -name '*.mod.c' \ -o -name '*.lex.c' -o -name '*.tab.[ch]' \ -o -name '*.symtypes' -o -name 'modules.order' \
Since commit f916757300 (imx: Create distinct pre-processed mkimage config files), *.cfgtmp files are no longer generated. There is no need to remove them on the 'clean' target anymore. Remove also the .gitignore glob. Cc: Trent Piepho <tpiepho@impinj.com> Signed-off-by: Baruch Siach <baruch@tkos.co.il> --- .gitignore | 1 - Makefile | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-)