* [Qemu-trivial] [PATCH] hw/i386/Makefile.obj: use $(PYTHON) to run .py scripts consistently
@ 2013-11-16 10:14 ` Michael Tokarev
0 siblings, 0 replies; 4+ messages in thread
From: Michael Tokarev @ 2013-11-16 10:14 UTC (permalink / raw)
To: qemu-trivial; +Cc: Luigi Rizzo, Michael Tokarev, qemu-devel, Stefan Weil
$(PYTHON) is a Make variable which is set by configure.
In all other places over the tree, .py files are run from
Makefiles using this variable, except of a single leftover
in hw/i386/Makefile.obj (and a nearby place in there uses
$(PYTHON) correctly). Fix this leftover too.
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
Cc: Luigi Rizzo <rizzo@iet.unipi.it>
Cc: Stefan Weil <sw@weilnetz.de>
--
mjt: I want to apply this to trivial-patches for-1.7
---
hw/i386/Makefile.objs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/i386/Makefile.objs b/hw/i386/Makefile.objs
index 185aacb..09ac433 100644
--- a/hw/i386/Makefile.objs
+++ b/hw/i386/Makefile.objs
@@ -20,7 +20,7 @@ hw/i386/%.hex: $(SRC_PATH)/hw/i386/%.dsl $(SRC_PATH)/scripts/acpi_extract_prepro
$(call quiet-command, cpp -P $< -o $*.dsl.i.orig, " CPP $(TARGET_DIR)$*.dsl.i.orig")
$(call quiet-command, $(PYTHON) $(SRC_PATH)/scripts/acpi_extract_preprocess.py $*.dsl.i.orig > $*.dsl.i, " ACPI_PREPROCESS $(TARGET_DIR)$*.dsl.i")
$(call quiet-command, $(IASL) $(call iasl-option,$(IASL),-Pn,) -vs -l -tc -p $* $*.dsl.i $(if $(V), , > /dev/null) 2>&1 ," IASL $(TARGET_DIR)$*.dsl.i")
- $(call quiet-command, $(SRC_PATH)/scripts/acpi_extract.py $*.lst > $*.off, " ACPI_EXTRACT $(TARGET_DIR)$*.off")
+ $(call quiet-command, $(PYTHON) $(SRC_PATH)/scripts/acpi_extract.py $*.lst > $*.off, " ACPI_EXTRACT $(TARGET_DIR)$*.off")
$(call quiet-command, cat $*.off > $@, " CAT $(TARGET_DIR)$@")
else
#IASL Not present. Restore pre-generated hex files.
--
1.7.10.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Qemu-devel] [PATCH] hw/i386/Makefile.obj: use $(PYTHON) to run .py scripts consistently
@ 2013-11-16 10:14 ` Michael Tokarev
0 siblings, 0 replies; 4+ messages in thread
From: Michael Tokarev @ 2013-11-16 10:14 UTC (permalink / raw)
To: qemu-trivial; +Cc: Luigi Rizzo, Michael Tokarev, qemu-devel, Stefan Weil
$(PYTHON) is a Make variable which is set by configure.
In all other places over the tree, .py files are run from
Makefiles using this variable, except of a single leftover
in hw/i386/Makefile.obj (and a nearby place in there uses
$(PYTHON) correctly). Fix this leftover too.
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
Cc: Luigi Rizzo <rizzo@iet.unipi.it>
Cc: Stefan Weil <sw@weilnetz.de>
--
mjt: I want to apply this to trivial-patches for-1.7
---
hw/i386/Makefile.objs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/i386/Makefile.objs b/hw/i386/Makefile.objs
index 185aacb..09ac433 100644
--- a/hw/i386/Makefile.objs
+++ b/hw/i386/Makefile.objs
@@ -20,7 +20,7 @@ hw/i386/%.hex: $(SRC_PATH)/hw/i386/%.dsl $(SRC_PATH)/scripts/acpi_extract_prepro
$(call quiet-command, cpp -P $< -o $*.dsl.i.orig, " CPP $(TARGET_DIR)$*.dsl.i.orig")
$(call quiet-command, $(PYTHON) $(SRC_PATH)/scripts/acpi_extract_preprocess.py $*.dsl.i.orig > $*.dsl.i, " ACPI_PREPROCESS $(TARGET_DIR)$*.dsl.i")
$(call quiet-command, $(IASL) $(call iasl-option,$(IASL),-Pn,) -vs -l -tc -p $* $*.dsl.i $(if $(V), , > /dev/null) 2>&1 ," IASL $(TARGET_DIR)$*.dsl.i")
- $(call quiet-command, $(SRC_PATH)/scripts/acpi_extract.py $*.lst > $*.off, " ACPI_EXTRACT $(TARGET_DIR)$*.off")
+ $(call quiet-command, $(PYTHON) $(SRC_PATH)/scripts/acpi_extract.py $*.lst > $*.off, " ACPI_EXTRACT $(TARGET_DIR)$*.off")
$(call quiet-command, cat $*.off > $@, " CAT $(TARGET_DIR)$@")
else
#IASL Not present. Restore pre-generated hex files.
--
1.7.10.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [Qemu-trivial] [PATCH] hw/i386/Makefile.obj: use $(PYTHON) to run .py scripts consistently
2013-11-16 10:14 ` [Qemu-devel] " Michael Tokarev
@ 2013-11-16 10:19 ` Stefan Weil
-1 siblings, 0 replies; 4+ messages in thread
From: Stefan Weil @ 2013-11-16 10:19 UTC (permalink / raw)
To: Michael Tokarev, qemu-trivial; +Cc: Luigi Rizzo, qemu-devel
Am 16.11.2013 11:14, schrieb Michael Tokarev:
> $(PYTHON) is a Make variable which is set by configure.
> In all other places over the tree, .py files are run from
> Makefiles using this variable, except of a single leftover
> in hw/i386/Makefile.obj (and a nearby place in there uses
> $(PYTHON) correctly). Fix this leftover too.
>
> Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
> Cc: Luigi Rizzo <rizzo@iet.unipi.it>
> Cc: Stefan Weil <sw@weilnetz.de>
>
> --
> mjt: I want to apply this to trivial-patches for-1.7
> ---
> hw/i386/Makefile.objs | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/hw/i386/Makefile.objs b/hw/i386/Makefile.objs
> index 185aacb..09ac433 100644
> --- a/hw/i386/Makefile.objs
> +++ b/hw/i386/Makefile.objs
> @@ -20,7 +20,7 @@ hw/i386/%.hex: $(SRC_PATH)/hw/i386/%.dsl $(SRC_PATH)/scripts/acpi_extract_prepro
> $(call quiet-command, cpp -P $< -o $*.dsl.i.orig, " CPP $(TARGET_DIR)$*.dsl.i.orig")
> $(call quiet-command, $(PYTHON) $(SRC_PATH)/scripts/acpi_extract_preprocess.py $*.dsl.i.orig > $*.dsl.i, " ACPI_PREPROCESS $(TARGET_DIR)$*.dsl.i")
> $(call quiet-command, $(IASL) $(call iasl-option,$(IASL),-Pn,) -vs -l -tc -p $* $*.dsl.i $(if $(V), , > /dev/null) 2>&1 ," IASL $(TARGET_DIR)$*.dsl.i")
> - $(call quiet-command, $(SRC_PATH)/scripts/acpi_extract.py $*.lst > $*.off, " ACPI_EXTRACT $(TARGET_DIR)$*.off")
> + $(call quiet-command, $(PYTHON) $(SRC_PATH)/scripts/acpi_extract.py $*.lst > $*.off, " ACPI_EXTRACT $(TARGET_DIR)$*.off")
> $(call quiet-command, cat $*.off > $@, " CAT $(TARGET_DIR)$@")
> else
> #IASL Not present. Restore pre-generated hex files.
Reviewed-by: Stefan Weil <sw@weilnetz.de>
Yes, this is a bug fix which should be included in QEMU 1.7.
Regards,
Stefan
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH] hw/i386/Makefile.obj: use $(PYTHON) to run .py scripts consistently
@ 2013-11-16 10:19 ` Stefan Weil
0 siblings, 0 replies; 4+ messages in thread
From: Stefan Weil @ 2013-11-16 10:19 UTC (permalink / raw)
To: Michael Tokarev, qemu-trivial; +Cc: Luigi Rizzo, qemu-devel
Am 16.11.2013 11:14, schrieb Michael Tokarev:
> $(PYTHON) is a Make variable which is set by configure.
> In all other places over the tree, .py files are run from
> Makefiles using this variable, except of a single leftover
> in hw/i386/Makefile.obj (and a nearby place in there uses
> $(PYTHON) correctly). Fix this leftover too.
>
> Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
> Cc: Luigi Rizzo <rizzo@iet.unipi.it>
> Cc: Stefan Weil <sw@weilnetz.de>
>
> --
> mjt: I want to apply this to trivial-patches for-1.7
> ---
> hw/i386/Makefile.objs | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/hw/i386/Makefile.objs b/hw/i386/Makefile.objs
> index 185aacb..09ac433 100644
> --- a/hw/i386/Makefile.objs
> +++ b/hw/i386/Makefile.objs
> @@ -20,7 +20,7 @@ hw/i386/%.hex: $(SRC_PATH)/hw/i386/%.dsl $(SRC_PATH)/scripts/acpi_extract_prepro
> $(call quiet-command, cpp -P $< -o $*.dsl.i.orig, " CPP $(TARGET_DIR)$*.dsl.i.orig")
> $(call quiet-command, $(PYTHON) $(SRC_PATH)/scripts/acpi_extract_preprocess.py $*.dsl.i.orig > $*.dsl.i, " ACPI_PREPROCESS $(TARGET_DIR)$*.dsl.i")
> $(call quiet-command, $(IASL) $(call iasl-option,$(IASL),-Pn,) -vs -l -tc -p $* $*.dsl.i $(if $(V), , > /dev/null) 2>&1 ," IASL $(TARGET_DIR)$*.dsl.i")
> - $(call quiet-command, $(SRC_PATH)/scripts/acpi_extract.py $*.lst > $*.off, " ACPI_EXTRACT $(TARGET_DIR)$*.off")
> + $(call quiet-command, $(PYTHON) $(SRC_PATH)/scripts/acpi_extract.py $*.lst > $*.off, " ACPI_EXTRACT $(TARGET_DIR)$*.off")
> $(call quiet-command, cat $*.off > $@, " CAT $(TARGET_DIR)$@")
> else
> #IASL Not present. Restore pre-generated hex files.
Reviewed-by: Stefan Weil <sw@weilnetz.de>
Yes, this is a bug fix which should be included in QEMU 1.7.
Regards,
Stefan
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-11-16 10:19 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-11-16 10:14 [Qemu-trivial] [PATCH] hw/i386/Makefile.obj: use $(PYTHON) to run .py scripts consistently Michael Tokarev
2013-11-16 10:14 ` [Qemu-devel] " Michael Tokarev
2013-11-16 10:19 ` [Qemu-trivial] " Stefan Weil
2013-11-16 10:19 ` [Qemu-devel] " Stefan Weil
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.