mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: pass .d file name to scripts/make_device_config.sh, fix makefile target

Browse Source 
The .d file name must match exactly what is used in the SUBDIR_DEVICES_MAK_DEP
variable.  Instead of making assumptions in the make_device_config.sh script,
just pass it in.

Similarly, the makefile target may not match the output file name, because
Makefile uses a temporary file.  Instead of making assumptions on what the
Makefile does, emit the config-devices.mak file to stdout, and use the
passed-in destination as the makefile target

Reported-by: Peter Maydell <peter.maydell@linaro.org>
Cc: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2015-03-12 16:00:05 +01:00
parent 4adf4180f2
commit 15564d85af
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -112,7 +112,8 @@ endif
-include $(SUBDIR_DEVICES_MAK_DEP) -include $(SUBDIR_DEVICES_MAK_DEP)
%/config-devices.mak: default-configs/%.mak %/config-devices.mak: default-configs/%.mak
$(call quiet-command,$(SHELL) $(SRC_PATH)/scripts/make_device_config.sh $@.tmp $<, " GEN $@.tmp") $(call quiet-command, \
$(SHELL) $(SRC_PATH)/scripts/make_device_config.sh $< $*-config-devices.mak.d $@ > $@.tmp, " GEN $@.tmp")
$(call quiet-command, if test -f $@; then \ $(call quiet-command, if test -f $@; then \
if cmp -s $@.old $@; then \ if cmp -s $@.old $@; then \
mv $@.tmp $@; \ mv $@.tmp $@; \

18
scripts/make_device_config.sh
View File

@ -1,10 +1,12 @@
#! /bin/sh #! /bin/sh
# Construct a target device config file from a default, pulling in any # Writes a target device config file to stdout, from a default and from
# files from include directives. # include directives therein. Also emits Makefile dependencies.
#
# Usage: make_device_config.sh SRC DEPFILE-NAME DEPFILE-TARGET > DEST
dest=$1 src=$1
dep=`dirname $1`-`basename $1`.d dep=$2
src=$2 target=$3
src_dir=`dirname $src` src_dir=`dirname $src`
all_includes= all_includes=
@ -22,7 +24,7 @@ while [ -n "$f" ] ; do
[ $? = 0 ] || exit 1 [ $? = 0 ] || exit 1
all_includes="$all_includes $f" all_includes="$all_includes $f"
done done
process_includes $src > $dest process_includes $src
cat $src $all_includes | grep -v '^include' > $dest cat $src $all_includes | grep -v '^include'
echo "$1: $all_includes" > $dep echo "$target: $all_includes" > $dep