tweaked variable logging

Preferences might be somewhat interesting too: while the official ones shouldn't influence the build result at all, there's no whitelist so all kinds of weirdness can be stuffed into local config in principle. That should be diagnosable at least.

tweaked variable logging
cc8982dd · Michael Shigorin · cd3e47c5 · cc8982dd · cc8982dd · cc8982dd
Commit cc8982dd authored Nov 04, 2011 by Michael Shigorin
Hide whitespace changes
Inline Side-by-side

Showing with 15 additions and 4 deletions

Makefile Makefile +3 -0

vars.mk image.in/vars.mk +11 -3

log.mk lib/log.mk +1 -1

No files found.
--- a/Makefile
+++ b/Makefile
@@ -18,6 +18,9 @@ IMAGE_NAME   := $(basename $(IMAGE_FILE))#	server-base
 IMAGE_TYPE   := $(suffix $(IMAGE_FILE))#	.iso (fix this too)
 IMAGE_TYPE   := $(IMAGE_TYPE:.%=%)#		iso
+# preferences
+-include $(HOME)/.mkimage/profiles.mk
 # most of the actual work done elsewhere
 include lib/*.mk
 include conf.d/*.mk

--- a/image.in/vars.mk
+++ b/image.in/vars.mk
 # dump interesting variables' effective values;
 # based on http://stackoverflow.com/questions/7117978
-SPAM := $(.VARIABLES) DISTCFG_MK
+# staged "uninteresting" lists
+SPAM := SPAM INIT PREFS DISTCFG DISTCFG_MK
+INIT := $(.VARIABLES)
+-include $(HOME)/.mkimage/profiles.mk
+PREFS := $(.VARIABLES)
 -include distcfg.mk
-HAM := $(.VARIABLES)
+DISTCFG := $(.VARIABLES)
+# a separator variable
+-- := --
 .PHONY: dump-vars
 dump-vars:
 	$(foreach v, \
-	  $(filter-out $(SPAM) SPAM,$(sort $(HAM))), \
+	  $(filter-out $(SPAM) $(INIT),$(sort $(PREFS))) -- \
+	  $(filter-out $(SPAM) $(PREFS),$(sort $(DISTCFG))), \
 	    $(info $(v) = $($(v))))
 	@:
--- a/lib/log.mk
+++ b/lib/log.mk
@@ -26,4 +26,4 @@ endif
 DATE = $(shell date +%Y%m%d)
 TIME = `date +%H:%M:%S`
-export BUILDLOG DATE DEBUG GLOBAL_DEBUG GLOBAL_VERBOSE LOG MAKE SHELL
+export BUILDLOG DATE GLOBAL_DEBUG GLOBAL_VERBOSE LOG MAKE SHELL