Skip to contentSkip to conversation

Makefile: drop mention of *.cfgtmp

PATCH New Baruch Siach 2 participants 3 messages Jun 18, 2018 – Jun 20, 2018 Kbuild

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Makefile: drop mention of *.cfgtmp

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.

---
 .gitignore | 1 -
 Makefile   | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)
.gitignore +0 -1
index 9110eda6468f..f97838a756a6 100644
@@ -20,7 +20,6 @@
 *.swp
 *.bin
 *.patch
-*.cfgtmp
 *.tab.[ch]
 
 # host programs on Cygwin
Makefile +1 -2
index 6a190e7a894b..61ef84576afa 100644
@@ -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' \
Signature · 1 line
2.17.1
#1 lore raw

PATCH 1/1 Makefile: drop mention of *.cfgtmp

Quoted 5 lines · Baruch Siach

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.

#2 lore raw

PATCH 1/1 Makefile: drop mention of *.cfgtmp

Hi Trent,

Quoted 5 lines · Trent Piepho
Quoted 4 lines · Baruch Siach

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.

Quoted 8 lines
Quoted 1 line

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

Signature · 3 lines
     http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -