From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=51958 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PM8LA-0007iF-R1 for qemu-devel@nongnu.org; Fri, 26 Nov 2010 19:08:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PM8L8-00057l-DQ for qemu-devel@nongnu.org; Fri, 26 Nov 2010 19:08:32 -0500 Received: from gateway.codesourcery.com ([38.113.113.105]:57904) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PM8L8-00057c-6b for qemu-devel@nongnu.org; Fri, 26 Nov 2010 19:08:30 -0500 From: Paul Brook Date: Sat, 27 Nov 2010 00:07:37 +0000 Message-Id: <1290816459-31009-2-git-send-email-paul@codesourcery.com> In-Reply-To: <1290816459-31009-1-git-send-email-paul@codesourcery.com> References: <1290816459-31009-1-git-send-email-paul@codesourcery.com> Subject: [Qemu-devel] [PATCH 1/3] Include directives in default configs List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Paul Brook Allow default configs to be split into several files. Signed-off-by: Paul Brook --- Makefile | 11 ++++++----- Makefile.objs | 3 ++- make_device_config.sh | 27 +++++++++++++++++++++++++++ 3 files changed, 35 insertions(+), 6 deletions(-) create mode 100644 make_device_config.sh diff --git a/Makefile b/Makefile index 3389775..d3bc0f2 100644 --- a/Makefile +++ b/Makefile @@ -39,18 +39,19 @@ endif SUBDIR_MAKEFLAGS=$(if $(V),,--no-print-directory) SUBDIR_DEVICES_MAK=$(patsubst %, %/config-devices.mak, $(TARGET_DIRS)) +SUBDIR_DEVICES_MAK_DEP=$(patsubst %, %/config-devices.mak.d, $(TARGET_DIRS)) config-all-devices.mak: $(SUBDIR_DEVICES_MAK) $(call quiet-command,cat $(SUBDIR_DEVICES_MAK) | grep =y | sort -u > $@," GEN $@") +-include $(SUBDIR_DEVICES_MAK_DEP) + %/config-devices.mak: default-configs/%.mak - $(call quiet-command,cat $< > $@.tmp, " GEN $@") + $(call quiet-command,$(SHELL) $(SRC_PATH)/make_device_config.sh $@ $<, " GEN $@") @if test -f $@; then \ if cmp -s $@.old $@; then \ - if ! cmp -s $@ $@.tmp; then \ - mv $@.tmp $@; \ - cp -p $@ $@.old; \ - fi; \ + mv $@.tmp $@; \ + cp -p $@ $@.old; \ else \ if test -f $@.old; then \ echo "WARNING: $@ (user modified) out of date.";\ diff --git a/Makefile.objs b/Makefile.objs index 23b17ce..4f4aba3 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -160,7 +160,8 @@ user-obj-y += cutils.o cache-utils.o hw-obj-y = hw-obj-y += vl.o loader.o hw-obj-y += virtio.o virtio-console.o -hw-obj-y += fw_cfg.o pci.o pci_host.o pcie_host.o pci_bridge.o +hw-obj-y += fw_cfg.o +hw-obj-$(CONFIG_PCI) += pci.o pci_host.o pcie_host.o pci_bridge.o hw-obj-y += ioh3420.o xio3130_upstream.o xio3130_downstream.o hw-obj-y += watchdog.o hw-obj-$(CONFIG_ISA_MMIO) += isa_mmio.o diff --git a/make_device_config.sh b/make_device_config.sh new file mode 100644 index 0000000..59f267b --- /dev/null +++ b/make_device_config.sh @@ -0,0 +1,27 @@ +#! /bin/sh +# Construct a target device config file from a default, pulling in any +# files from include directives. + +dest=$1.tmp +dep=$1.d +src=$2 +src_dir=`dirname $src` +all_includes= + +process_includes () { + cat $1 | grep '^include' | \ + while read include file ; do + all_includes="$all_includes $src_dir/$file" + process_includes $src_dir/$file + done +} + +f=$src +while [ -n "$f" ] ; do + f=`awk '/^include / {print "'$src_dir'/" $2}' $f` + all_includes="$all_includes $f" +done +process_includes $src > $dest + +cat $src $all_includes | grep -v '^include' > $dest +echo "$1: $all_includes" > $dep -- 1.7.2.3