Skip to contentSkip to conversation

Makefile: avoid defconfig annoyance

PATCH New Michael S. Tsirkin 1 participant 1 message Dec 13, 2009 Kbuild

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Makefile: avoid defconfig annoyance

This will be the last time you get
'config-devices.mak out of date' warning.

We have a config-devices.mak feature, which
makes it possile for distros to disable devices
they do not want. However, this is annoyng
for development where you just want
to use the default most of the time.

We want to distinguish between user overriding config manually and just updating from git.
Do this, by sticking include directive in the generated files, and avoiding error if the generated file only has such include directives.

This patch is also careful to:
- not print warning while defconfig target is run
- tell user what will happen if make defconfig is run instead of just telling her what to do

---
 Makefile |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)
Makefile +7 -4
index a662d96..469ce43 100644
@@ -39,18 +39,21 @@ SUBDIR_MAKEFLAGS=$(if $(V),,--no-print-directory)
 SUBDIR_DEVICES_MAK=$(patsubst %, %/config-devices.mak, $(TARGET_DIRS))
 
 config-all-devices.mak: $(SUBDIR_DEVICES_MAK)
-	$(call quiet-command,cat $(SUBDIR_DEVICES_MAK) | grep =y | sort -u > $@,"  GEN   $@")
+	$(call quiet-command,cat $(SUBDIR_DEVICES_MAK) | \
+		grep -e =y -e ^-include | sort -u > $@,"  GEN   $@")
 
 %/config-devices.mak: default-configs/%.mak
-	$(call quiet-command,cat $< > [email protected], "  GEN   $@")
-	@if test -f $@ ; then \
+	$(call quiet-command,echo '-include $<'> [email protected], "  GEN   $@")
+	@if test -z "${QEMU_MAKE_DEFCONFIG}" -a -f $@ && \
+            grep -v '^-?include' $@ ; then \
 	  echo "WARNING: $@ out of date." ;\
-	  echo "Run \"make defconfig\" to regenerate." ; \
+	  echo "Update it or run \"make defconfig\" to remove it." ; \
 	  rm [email protected] ; \
 	 else \
 	  mv [email protected] $@ ; \
 	 fi
 
+defconfig: QEMU_MAKE_DEFCONFIG=yes
 defconfig:
 	rm -f config-all-devices.mak $(SUBDIR_DEVICES_MAK)
 
Signature · 1 line
1.6.6.rc1.43.gf55cc