Skip to contentSkip to conversation

kbuild: remove .tmp file when filechk fails

PATCH New Masahiro Yamada 1 participant 1 message Jan 10, 2020 Kbuild

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 kbuild: remove .tmp file when filechk fails

Bartosz Golaszewski reports that when "make {menu,n,g,x}config" fails due to missing packages, a temporary file is left over, which is not ignored by git.

For example, if GTK+ is not installed:

  $ make gconfig
  *
  * Unable to find the GTK+ installation. Please make sure that
  * the GTK+ 2.0 development package is correctly installed.
  * You need gtk+-2.0 gmodule-2.0 libglade-2.0
  *
  scripts/kconfig/Makefile:208: recipe for target 'scripts/kconfig/gconf-cfg' failed
  make[1]: *** [scripts/kconfig/gconf-cfg] Error 1
  Makefile:567: recipe for target 'gconfig' failed
  make: *** [gconfig] Error 2
  $ git status
  HEAD detached at v5.4
  Untracked files:
    (use "git add <file>..." to include in what will be committed)

scripts/kconfig/gconf-cfg.tmp

nothing added to commit but untracked files present (use "git add" to track)

This is because the check scripts are run with filechk, which misses to clean up the temporary file on failure.

When the line

  { $(filechk_$(1)); } > [email protected];

... fails, it exits immediately due to the 'set -e'. Use trap to make sure to delete the temporary file on exit.

For extra safety, I replaced [email protected] with $(dot-target).tmp to make it a hidden file.

---

 scripts/Kbuild.include | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)
scripts/Kbuild.include +7 -8
index 3da8321efb74..6cabf20ce66a 100644
@@ -59,14 +59,13 @@ kecho := $($(quiet)kecho)
 # - stdin is piped in from the first prerequisite ($<) so one has
 #   to specify a valid file as first prerequisite (often the kbuild file)
 define filechk
-	$(Q)set -e;				\
-	mkdir -p $(dir $@);			\
-	{ $(filechk_$(1)); } > [email protected];		\
-	if [ -r $@ ] && cmp -s $@ [email protected]; then	\
-		rm -f [email protected];			\
-	else					\
-		$(kecho) '  UPD     $@';	\
-		mv -f [email protected] $@;		\
+	$(Q)set -e;						\
+	mkdir -p $(dir $@);					\
+	trap "rm -f $(dot-target).tmp" EXIT;			\
+	{ $(filechk_$(1)); } > $(dot-target).tmp;		\
+	if [ ! -r $@ ] || ! cmp -s $@ $(dot-target).tmp; then	\
+		$(kecho) '  UPD     $@';			\
+		mv -f $(dot-target).tmp $@;			\
 	fi
 endef
 
Signature · 1 line
2.17.1