* [Qemu-devel] [PATCH 1/2] Makefile: don't silence mak file test with V=1
@ 2015-02-19 7:48 Michael S. Tsirkin
2015-02-19 7:48 ` [Qemu-devel] [PATCH 2/2] Makefile.target: binary depends on config-devices Michael S. Tsirkin
` (2 more replies)
0 siblings, 3 replies; 11+ messages in thread
From: Michael S. Tsirkin @ 2015-02-19 7:48 UTC (permalink / raw)
To: qemu-devel
Cc: peter.maydell, Fam Zheng, Michael Tokarev, blauwirbel,
Stefan Hajnoczi, Paolo Bonzini, =?UTF-8?q?Llu=C3=ADs=20Vilanova?=
V=1 should show what's going on, it's not nice
to silence things unconditionally.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index 6817c6f..84ca8be 100644
--- a/Makefile
+++ b/Makefile
@@ -110,7 +110,7 @@ endif
%/config-devices.mak: default-configs/%.mak
$(call quiet-command,$(SHELL) $(SRC_PATH)/scripts/make_device_config.sh $@ $<, " GEN $@")
- @if test -f $@; then \
+ $(call quiet-command, if test -f $@; then \
if cmp -s $@.old $@; then \
mv $@.tmp $@; \
cp -p $@ $@.old; \
@@ -126,7 +126,7 @@ endif
else \
mv $@.tmp $@; \
cp -p $@ $@.old; \
- fi
+ fi, " TEST $@");
defconfig:
rm -f config-all-devices.mak $(SUBDIR_DEVICES_MAK)
--
MST
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [Qemu-devel] [PATCH 2/2] Makefile.target: binary depends on config-devices
2015-02-19 7:48 [Qemu-devel] [PATCH 1/2] Makefile: don't silence mak file test with V=1 Michael S. Tsirkin
@ 2015-02-19 7:48 ` Michael S. Tsirkin
2015-02-25 6:35 ` Fam Zheng
2015-02-27 18:41 ` Paolo Bonzini
2015-02-25 6:34 ` [Qemu-devel] [PATCH 1/2] Makefile: don't silence mak file test with V=1 Fam Zheng
2015-02-27 18:40 ` Paolo Bonzini
2 siblings, 2 replies; 11+ messages in thread
From: Michael S. Tsirkin @ 2015-02-19 7:48 UTC (permalink / raw)
To: qemu-devel
Cc: peter.maydell, Fam Zheng, Michael Tokarev, blauwirbel,
Stefan Hajnoczi, Paolo Bonzini, =?UTF-8?q?Llu=C3=ADs=20Vilanova?=
relink binary whenever config-devices.mak changes:
this makes sense as we are adding/removing devices,
so binary has to be relinked to be up to date.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
Makefile.target | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/Makefile.target b/Makefile.target
index 58c6ae1..2262d89 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -175,9 +175,11 @@ all-obj-y += $(common-obj-y)
all-obj-y += $(target-obj-y)
all-obj-$(CONFIG_SOFTMMU) += $(block-obj-y)
+$(QEMU_PROG_BUILD): config-devices.mak
+
# build either PROG or PROGW
$(QEMU_PROG_BUILD): $(all-obj-y) ../libqemuutil.a ../libqemustub.a
- $(call LINK,$^)
+ $(call LINK, $(filter-out %.mak, $^))
gdbstub-xml.c: $(TARGET_XML_FILES) $(SRC_PATH)/scripts/feature_to_c.sh
$(call quiet-command,rm -f $@ && $(SHELL) $(SRC_PATH)/scripts/feature_to_c.sh $@ $(TARGET_XML_FILES)," GEN $(TARGET_DIR)$@")
--
MST
^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [Qemu-devel] [PATCH 1/2] Makefile: don't silence mak file test with V=1
2015-02-19 7:48 [Qemu-devel] [PATCH 1/2] Makefile: don't silence mak file test with V=1 Michael S. Tsirkin
2015-02-19 7:48 ` [Qemu-devel] [PATCH 2/2] Makefile.target: binary depends on config-devices Michael S. Tsirkin
@ 2015-02-25 6:34 ` Fam Zheng
2015-02-27 18:40 ` Paolo Bonzini
2 siblings, 0 replies; 11+ messages in thread
From: Fam Zheng @ 2015-02-25 6:34 UTC (permalink / raw)
To: Michael S. Tsirkin
Cc: peter.maydell, Michael Tokarev, qemu-devel, blauwirbel,
Stefan Hajnoczi, Paolo Bonzini, =?UTF-8?q?Llu=C3=ADs=20Vilanova?=
On Thu, 02/19 08:48, Michael S. Tsirkin wrote:
> V=1 should show what's going on, it's not nice
> to silence things unconditionally.
>
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> ---
> Makefile | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index 6817c6f..84ca8be 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -110,7 +110,7 @@ endif
>
> %/config-devices.mak: default-configs/%.mak
> $(call quiet-command,$(SHELL) $(SRC_PATH)/scripts/make_device_config.sh $@ $<, " GEN $@")
> - @if test -f $@; then \
> + $(call quiet-command, if test -f $@; then \
> if cmp -s $@.old $@; then \
> mv $@.tmp $@; \
> cp -p $@ $@.old; \
> @@ -126,7 +126,7 @@ endif
> else \
> mv $@.tmp $@; \
> cp -p $@ $@.old; \
> - fi
> + fi, " TEST $@");
Probably " GEN $@" is better, otherwise:
Reviewed-by: Fam Zheng <famz@redhat.com>
>
> defconfig:
> rm -f config-all-devices.mak $(SUBDIR_DEVICES_MAK)
> --
> MST
>
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [Qemu-devel] [PATCH 2/2] Makefile.target: binary depends on config-devices
2015-02-19 7:48 ` [Qemu-devel] [PATCH 2/2] Makefile.target: binary depends on config-devices Michael S. Tsirkin
@ 2015-02-25 6:35 ` Fam Zheng
2015-02-27 18:41 ` Paolo Bonzini
1 sibling, 0 replies; 11+ messages in thread
From: Fam Zheng @ 2015-02-25 6:35 UTC (permalink / raw)
To: Michael S. Tsirkin
Cc: peter.maydell, Michael Tokarev, qemu-devel, blauwirbel,
Stefan Hajnoczi, Paolo Bonzini, =?UTF-8?q?Llu=C3=ADs=20Vilanova?=
On Thu, 02/19 08:48, Michael S. Tsirkin wrote:
> relink binary whenever config-devices.mak changes:
> this makes sense as we are adding/removing devices,
> so binary has to be relinked to be up to date.
>
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> ---
> Makefile.target | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/Makefile.target b/Makefile.target
> index 58c6ae1..2262d89 100644
> --- a/Makefile.target
> +++ b/Makefile.target
> @@ -175,9 +175,11 @@ all-obj-y += $(common-obj-y)
> all-obj-y += $(target-obj-y)
> all-obj-$(CONFIG_SOFTMMU) += $(block-obj-y)
>
> +$(QEMU_PROG_BUILD): config-devices.mak
> +
> # build either PROG or PROGW
> $(QEMU_PROG_BUILD): $(all-obj-y) ../libqemuutil.a ../libqemustub.a
> - $(call LINK,$^)
> + $(call LINK, $(filter-out %.mak, $^))
>
> gdbstub-xml.c: $(TARGET_XML_FILES) $(SRC_PATH)/scripts/feature_to_c.sh
> $(call quiet-command,rm -f $@ && $(SHELL) $(SRC_PATH)/scripts/feature_to_c.sh $@ $(TARGET_XML_FILES)," GEN $(TARGET_DIR)$@")
> --
> MST
>
Reviewed-by: Fam Zheng <famz@redhat.com>
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [Qemu-devel] [PATCH 1/2] Makefile: don't silence mak file test with V=1
2015-02-19 7:48 [Qemu-devel] [PATCH 1/2] Makefile: don't silence mak file test with V=1 Michael S. Tsirkin
2015-02-19 7:48 ` [Qemu-devel] [PATCH 2/2] Makefile.target: binary depends on config-devices Michael S. Tsirkin
2015-02-25 6:34 ` [Qemu-devel] [PATCH 1/2] Makefile: don't silence mak file test with V=1 Fam Zheng
@ 2015-02-27 18:40 ` Paolo Bonzini
2015-02-28 0:57 ` Fam Zheng
` (2 more replies)
2 siblings, 3 replies; 11+ messages in thread
From: Paolo Bonzini @ 2015-02-27 18:40 UTC (permalink / raw)
To: Michael S. Tsirkin, qemu-devel
Cc: peter.maydell, Fam Zheng, Michael Tokarev, blauwirbel,
Stefan Hajnoczi, Lluís Vilanova
On 19/02/2015 08:48, Michael S. Tsirkin wrote:
> V=1 should show what's going on, it's not nice
> to silence things unconditionally.
>
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> ---
> Makefile | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index 6817c6f..84ca8be 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -110,7 +110,7 @@ endif
>
> %/config-devices.mak: default-configs/%.mak
> $(call quiet-command,$(SHELL) $(SRC_PATH)/scripts/make_device_config.sh $@ $<, " GEN $@")
> - @if test -f $@; then \
> + $(call quiet-command, if test -f $@; then \
> if cmp -s $@.old $@; then \
> mv $@.tmp $@; \
> cp -p $@ $@.old; \
> @@ -126,7 +126,7 @@ endif
> else \
> mv $@.tmp $@; \
> cp -p $@ $@.old; \
> - fi
> + fi, " TEST $@");
>
> defconfig:
> rm -f config-all-devices.mak $(SUBDIR_DEVICES_MAK)
>
Squashing this to make the non-verbose messages clearer, ok?
diff --git a/Makefile b/Makefile
index 5604209..d92d4cd 100644
--- a/Makefile
+++ b/Makefile
@@ -109,7 +109,7 @@ endif
-include $(SUBDIR_DEVICES_MAK_DEP)
%/config-devices.mak: default-configs/%.mak
- $(call quiet-command,$(SHELL) $(SRC_PATH)/scripts/make_device_config.sh $@ $<, " GEN $@")
+ $(call quiet-command,$(SHELL) $(SRC_PATH)/scripts/make_device_config.sh $@.tmp $<, " GEN $@.tmp")
$(call quiet-command, if test -f $@; then \
if cmp -s $@.old $@; then \
mv $@.tmp $@; \
@@ -126,7 +126,7 @@ endif
else \
mv $@.tmp $@; \
cp -p $@ $@.old; \
- fi, " TEST $@");
+ fi, " GEN $@");
defconfig:
rm -f config-all-devices.mak $(SUBDIR_DEVICES_MAK)
diff --git a/scripts/make_device_config.sh b/scripts/make_device_config.sh
index 7242707..7958086 100644
--- a/scripts/make_device_config.sh
+++ b/scripts/make_device_config.sh
@@ -2,7 +2,7 @@
# Construct a target device config file from a default, pulling in any
# files from include directives.
-dest=$1.tmp
+dest=$1
dep=`dirname $1`-`basename $1`.d
src=$2
src_dir=`dirname $src`
^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [Qemu-devel] [PATCH 2/2] Makefile.target: binary depends on config-devices
2015-02-19 7:48 ` [Qemu-devel] [PATCH 2/2] Makefile.target: binary depends on config-devices Michael S. Tsirkin
2015-02-25 6:35 ` Fam Zheng
@ 2015-02-27 18:41 ` Paolo Bonzini
1 sibling, 0 replies; 11+ messages in thread
From: Paolo Bonzini @ 2015-02-27 18:41 UTC (permalink / raw)
To: Michael S. Tsirkin, qemu-devel
Cc: peter.maydell, Fam Zheng, Michael Tokarev, blauwirbel,
Stefan Hajnoczi, Lluís Vilanova
On 19/02/2015 08:48, Michael S. Tsirkin wrote:
> relink binary whenever config-devices.mak changes:
> this makes sense as we are adding/removing devices,
> so binary has to be relinked to be up to date.
>
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> ---
> Makefile.target | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/Makefile.target b/Makefile.target
> index 58c6ae1..2262d89 100644
> --- a/Makefile.target
> +++ b/Makefile.target
> @@ -175,9 +175,11 @@ all-obj-y += $(common-obj-y)
> all-obj-y += $(target-obj-y)
> all-obj-$(CONFIG_SOFTMMU) += $(block-obj-y)
>
> +$(QEMU_PROG_BUILD): config-devices.mak
> +
> # build either PROG or PROGW
> $(QEMU_PROG_BUILD): $(all-obj-y) ../libqemuutil.a ../libqemustub.a
> - $(call LINK,$^)
> + $(call LINK, $(filter-out %.mak, $^))
>
> gdbstub-xml.c: $(TARGET_XML_FILES) $(SRC_PATH)/scripts/feature_to_c.sh
> $(call quiet-command,rm -f $@ && $(SHELL) $(SRC_PATH)/scripts/feature_to_c.sh $@ $(TARGET_XML_FILES)," GEN $(TARGET_DIR)$@")
>
Not exactly beautiful, but I don't have any better idea.
Applied, thanks.
Paolo
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [Qemu-devel] [PATCH 1/2] Makefile: don't silence mak file test with V=1
2015-02-27 18:40 ` Paolo Bonzini
@ 2015-02-28 0:57 ` Fam Zheng
2015-03-02 15:52 ` Eric Blake
2015-02-28 18:50 ` Michael S. Tsirkin
2015-03-11 17:24 ` Peter Maydell
2 siblings, 1 reply; 11+ messages in thread
From: Fam Zheng @ 2015-02-28 0:57 UTC (permalink / raw)
To: Paolo Bonzini
Cc: peter.maydell, Michael S. Tsirkin, Michael Tokarev, qemu-devel,
blauwirbel, Stefan Hajnoczi, Lluís Vilanova
On Fri, 02/27 19:40, Paolo Bonzini wrote:
>
>
> On 19/02/2015 08:48, Michael S. Tsirkin wrote:
> > V=1 should show what's going on, it's not nice
> > to silence things unconditionally.
> >
> > Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> > ---
> > Makefile | 4 ++--
> > 1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/Makefile b/Makefile
> > index 6817c6f..84ca8be 100644
> > --- a/Makefile
> > +++ b/Makefile
> > @@ -110,7 +110,7 @@ endif
> >
> > %/config-devices.mak: default-configs/%.mak
> > $(call quiet-command,$(SHELL) $(SRC_PATH)/scripts/make_device_config.sh $@ $<, " GEN $@")
> > - @if test -f $@; then \
> > + $(call quiet-command, if test -f $@; then \
> > if cmp -s $@.old $@; then \
> > mv $@.tmp $@; \
> > cp -p $@ $@.old; \
> > @@ -126,7 +126,7 @@ endif
> > else \
> > mv $@.tmp $@; \
> > cp -p $@ $@.old; \
> > - fi
> > + fi, " TEST $@");
> >
> > defconfig:
> > rm -f config-all-devices.mak $(SUBDIR_DEVICES_MAK)
> >
>
> Squashing this to make the non-verbose messages clearer, ok?
>
> diff --git a/Makefile b/Makefile
> index 5604209..d92d4cd 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -109,7 +109,7 @@ endif
> -include $(SUBDIR_DEVICES_MAK_DEP)
>
> %/config-devices.mak: default-configs/%.mak
> - $(call quiet-command,$(SHELL) $(SRC_PATH)/scripts/make_device_config.sh $@ $<, " GEN $@")
> + $(call quiet-command,$(SHELL) $(SRC_PATH)/scripts/make_device_config.sh $@.tmp $<, " GEN $@.tmp")
> $(call quiet-command, if test -f $@; then \
> if cmp -s $@.old $@; then \
> mv $@.tmp $@; \
> @@ -126,7 +126,7 @@ endif
> else \
> mv $@.tmp $@; \
> cp -p $@ $@.old; \
> - fi, " TEST $@");
> + fi, " GEN $@");
>
> defconfig:
> rm -f config-all-devices.mak $(SUBDIR_DEVICES_MAK)
> diff --git a/scripts/make_device_config.sh b/scripts/make_device_config.sh
> index 7242707..7958086 100644
> --- a/scripts/make_device_config.sh
> +++ b/scripts/make_device_config.sh
> @@ -2,7 +2,7 @@
> # Construct a target device config file from a default, pulling in any
> # files from include directives.
>
> -dest=$1.tmp
> +dest=$1
> dep=`dirname $1`-`basename $1`.d
> src=$2
> src_dir=`dirname $src`
Looks good to me.
Fam
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [Qemu-devel] [PATCH 1/2] Makefile: don't silence mak file test with V=1
2015-02-27 18:40 ` Paolo Bonzini
2015-02-28 0:57 ` Fam Zheng
@ 2015-02-28 18:50 ` Michael S. Tsirkin
2015-03-11 17:24 ` Peter Maydell
2 siblings, 0 replies; 11+ messages in thread
From: Michael S. Tsirkin @ 2015-02-28 18:50 UTC (permalink / raw)
To: Paolo Bonzini
Cc: peter.maydell, Fam Zheng, Michael Tokarev, qemu-devel,
blauwirbel, Stefan Hajnoczi, Lluís Vilanova
On Fri, Feb 27, 2015 at 07:40:26PM +0100, Paolo Bonzini wrote:
>
>
> On 19/02/2015 08:48, Michael S. Tsirkin wrote:
> > V=1 should show what's going on, it's not nice
> > to silence things unconditionally.
> >
> > Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> > ---
> > Makefile | 4 ++--
> > 1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/Makefile b/Makefile
> > index 6817c6f..84ca8be 100644
> > --- a/Makefile
> > +++ b/Makefile
> > @@ -110,7 +110,7 @@ endif
> >
> > %/config-devices.mak: default-configs/%.mak
> > $(call quiet-command,$(SHELL) $(SRC_PATH)/scripts/make_device_config.sh $@ $<, " GEN $@")
> > - @if test -f $@; then \
> > + $(call quiet-command, if test -f $@; then \
> > if cmp -s $@.old $@; then \
> > mv $@.tmp $@; \
> > cp -p $@ $@.old; \
> > @@ -126,7 +126,7 @@ endif
> > else \
> > mv $@.tmp $@; \
> > cp -p $@ $@.old; \
> > - fi
> > + fi, " TEST $@");
> >
> > defconfig:
> > rm -f config-all-devices.mak $(SUBDIR_DEVICES_MAK)
> >
>
> Squashing this to make the non-verbose messages clearer, ok?
Acked-by: Michael S. Tsirkin <mst@redhat.com>
> diff --git a/Makefile b/Makefile
> index 5604209..d92d4cd 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -109,7 +109,7 @@ endif
> -include $(SUBDIR_DEVICES_MAK_DEP)
>
> %/config-devices.mak: default-configs/%.mak
> - $(call quiet-command,$(SHELL) $(SRC_PATH)/scripts/make_device_config.sh $@ $<, " GEN $@")
> + $(call quiet-command,$(SHELL) $(SRC_PATH)/scripts/make_device_config.sh $@.tmp $<, " GEN $@.tmp")
> $(call quiet-command, if test -f $@; then \
> if cmp -s $@.old $@; then \
> mv $@.tmp $@; \
> @@ -126,7 +126,7 @@ endif
> else \
> mv $@.tmp $@; \
> cp -p $@ $@.old; \
> - fi, " TEST $@");
> + fi, " GEN $@");
>
> defconfig:
> rm -f config-all-devices.mak $(SUBDIR_DEVICES_MAK)
> diff --git a/scripts/make_device_config.sh b/scripts/make_device_config.sh
> index 7242707..7958086 100644
> --- a/scripts/make_device_config.sh
> +++ b/scripts/make_device_config.sh
> @@ -2,7 +2,7 @@
> # Construct a target device config file from a default, pulling in any
> # files from include directives.
>
> -dest=$1.tmp
> +dest=$1
> dep=`dirname $1`-`basename $1`.d
> src=$2
> src_dir=`dirname $src`
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [Qemu-devel] [PATCH 1/2] Makefile: don't silence mak file test with V=1
2015-02-28 0:57 ` Fam Zheng
@ 2015-03-02 15:52 ` Eric Blake
2015-03-02 16:22 ` Paolo Bonzini
0 siblings, 1 reply; 11+ messages in thread
From: Eric Blake @ 2015-03-02 15:52 UTC (permalink / raw)
To: Fam Zheng, Paolo Bonzini
Cc: peter.maydell, Michael S. Tsirkin, Michael Tokarev, qemu-devel,
blauwirbel, Stefan Hajnoczi, Lluís Vilanova
[-- Attachment #1: Type: text/plain, Size: 452 bytes --]
On 02/27/2015 05:57 PM, Fam Zheng wrote:
> On Fri, 02/27 19:40, Paolo Bonzini wrote:
>>
>>
>> On 19/02/2015 08:48, Michael S. Tsirkin wrote:
>>> V=1 should show what's going on, it's not nice
>>> to silence things unconditionally.
>> Squashing this to make the non-verbose messages clearer, ok?
Also, s/mak/make/ in the subject
--
Eric Blake eblake redhat com +1-919-301-3266
Libvirt virtualization library http://libvirt.org
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 604 bytes --]
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [Qemu-devel] [PATCH 1/2] Makefile: don't silence mak file test with V=1
2015-03-02 15:52 ` Eric Blake
@ 2015-03-02 16:22 ` Paolo Bonzini
0 siblings, 0 replies; 11+ messages in thread
From: Paolo Bonzini @ 2015-03-02 16:22 UTC (permalink / raw)
To: Eric Blake, Fam Zheng
Cc: peter.maydell, Michael S. Tsirkin, Michael Tokarev, qemu-devel,
blauwirbel, Stefan Hajnoczi, Lluís Vilanova
On 02/03/2015 16:52, Eric Blake wrote:
> On 02/27/2015 05:57 PM, Fam Zheng wrote:
>> On Fri, 02/27 19:40, Paolo Bonzini wrote:
>>>
>>>
>>> On 19/02/2015 08:48, Michael S. Tsirkin wrote:
>>>> V=1 should show what's going on, it's not nice to silence
>>>> things unconditionally.
>
>>> Squashing this to make the non-verbose messages clearer, ok?
>
> Also, s/mak/make/ in the subject
It would be more like s/mak/.mak/ :) But I've already sent a pull
request.
Paolo
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [Qemu-devel] [PATCH 1/2] Makefile: don't silence mak file test with V=1
2015-02-27 18:40 ` Paolo Bonzini
2015-02-28 0:57 ` Fam Zheng
2015-02-28 18:50 ` Michael S. Tsirkin
@ 2015-03-11 17:24 ` Peter Maydell
2 siblings, 0 replies; 11+ messages in thread
From: Peter Maydell @ 2015-03-11 17:24 UTC (permalink / raw)
To: Paolo Bonzini
Cc: Fam Zheng, Michael S. Tsirkin, Michael Tokarev, QEMU Developers,
Blue Swirl, Stefan Hajnoczi, Lluís Vilanova
On 27 February 2015 at 18:40, Paolo Bonzini <pbonzini@redhat.com> wrote:
> Squashing this to make the non-verbose messages clearer, ok?
>
> diff --git a/Makefile b/Makefile
> index 5604209..d92d4cd 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -109,7 +109,7 @@ endif
> -include $(SUBDIR_DEVICES_MAK_DEP)
>
> %/config-devices.mak: default-configs/%.mak
> - $(call quiet-command,$(SHELL) $(SRC_PATH)/scripts/make_device_config.sh $@ $<, " GEN $@")
> + $(call quiet-command,$(SHELL) $(SRC_PATH)/scripts/make_device_config.sh $@.tmp $<, " GEN $@.tmp")
> $(call quiet-command, if test -f $@; then \
> if cmp -s $@.old $@; then \
> mv $@.tmp $@; \
> @@ -126,7 +126,7 @@ endif
> else \
> mv $@.tmp $@; \
> cp -p $@ $@.old; \
> - fi, " TEST $@");
> + fi, " GEN $@");
>
> defconfig:
> rm -f config-all-devices.mak $(SUBDIR_DEVICES_MAK)
> diff --git a/scripts/make_device_config.sh b/scripts/make_device_config.sh
> index 7242707..7958086 100644
> --- a/scripts/make_device_config.sh
> +++ b/scripts/make_device_config.sh
> @@ -2,7 +2,7 @@
> # Construct a target device config file from a default, pulling in any
> # files from include directives.
>
> -dest=$1.tmp
> +dest=$1
> dep=`dirname $1`-`basename $1`.d
> src=$2
> src_dir=`dirname $src`
This squashed-in change breaks automatically rebuilding the
config-devices.mak file when a default-configs file indirectly
included from the architecture's top level config is changed.
(This is most common for AArch64 because of the way it includes
the arm-softmmu config file; so any change to the arm-softmmu
device configs means the aarch64-softmmu qemu isn't rebuilt as
it should be.)
The problem is that we're now passing the script $@.tmp as its
first argument, and so the 'dep' filename it constructs
ends up as aarch64-softmmu-config-devices.mak.tmp.d. But the
Makefile include line defining the dep file to pull in is:
SUBDIR_DEVICES_MAK_DEP=$(patsubst %, %-config-devices.mak.d, $(TARGET_DIRS))
so we never include the .d file at all.
The basic "%/config-devices.mak: default-configs/%.mak" rule
means that this is only a problem for the indirectly included
config files.
-- PMM
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2015-03-11 17:25 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-02-19 7:48 [Qemu-devel] [PATCH 1/2] Makefile: don't silence mak file test with V=1 Michael S. Tsirkin
2015-02-19 7:48 ` [Qemu-devel] [PATCH 2/2] Makefile.target: binary depends on config-devices Michael S. Tsirkin
2015-02-25 6:35 ` Fam Zheng
2015-02-27 18:41 ` Paolo Bonzini
2015-02-25 6:34 ` [Qemu-devel] [PATCH 1/2] Makefile: don't silence mak file test with V=1 Fam Zheng
2015-02-27 18:40 ` Paolo Bonzini
2015-02-28 0:57 ` Fam Zheng
2015-03-02 15:52 ` Eric Blake
2015-03-02 16:22 ` Paolo Bonzini
2015-02-28 18:50 ` Michael S. Tsirkin
2015-03-11 17:24 ` Peter Maydell
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.