[Qemu-trivial] [PATCH] better interpreter specification for scripts

[Qemu-trivial] [PATCH] better interpreter specification for scripts

[Luigi Rizzo]

[-- Attachment #1: Type: text/plain, Size: 878 bytes --]

some of the new scripts in scripts/ specify a interpreter path
which is not always pointing to the right place.
I see that an alternative format is also being used
        #!/usr/bin/env <interpreter_name>
which seems to work better.

The patch below is merely to let master compile on FreeBSD,
but there are other offending files that can be found with
 grep '#!' scripts/*

Signed-off-by: Luigi Rizzo <rizzo@iet.unipi.it>
---
 scripts/acpi_extract.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/acpi_extract.py b/scripts/acpi_extract.py
index 22ea468..66c1b3e 100755
--- a/scripts/acpi_extract.py
+++ b/scripts/acpi_extract.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # Copyright (C) 2011 Red Hat, Inc., Michael S. Tsirkin <mst@redhat.com>
 #
 # This program is free software; you can redistribute it and/or modify
--
1.8.1.2

[-- Attachment #2: Type: text/html, Size: 3162 bytes --]

[Qemu-devel] [PATCH] better interpreter specification for scripts

[Luigi Rizzo]

[-- Attachment #1: Type: text/plain, Size: 878 bytes --]

some of the new scripts in scripts/ specify a interpreter path
which is not always pointing to the right place.
I see that an alternative format is also being used
        #!/usr/bin/env <interpreter_name>
which seems to work better.

The patch below is merely to let master compile on FreeBSD,
but there are other offending files that can be found with
 grep '#!' scripts/*

Signed-off-by: Luigi Rizzo <rizzo@iet.unipi.it>
---
 scripts/acpi_extract.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/acpi_extract.py b/scripts/acpi_extract.py
index 22ea468..66c1b3e 100755
--- a/scripts/acpi_extract.py
+++ b/scripts/acpi_extract.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # Copyright (C) 2011 Red Hat, Inc., Michael S. Tsirkin <mst@redhat.com>
 #
 # This program is free software; you can redistribute it and/or modify
--
1.8.1.2

[-- Attachment #2: Type: text/html, Size: 3162 bytes --]

Re: [Qemu-trivial] [Qemu-devel] [PATCH] better interpreter specification for scripts

[Stefan Weil]

[-- Attachment #1: Type: text/plain, Size: 1541 bytes --]

Am 15.11.2013 07:51, schrieb Luigi Rizzo:
> some of the new scripts in scripts/ specify a interpreter path
> which is not always pointing to the right place.
> I see that an alternative format is also being used
>         #!/usr/bin/env <interpreter_name>
> which seems to work better.
>
> The patch below is merely to let master compile on FreeBSD,
> but there are other offending files that can be found with
>  grep '#!' scripts/*

There is no need to fix acpi_extract.py here, because the error is in
hw/i386/Makefile.objs:

It should call the script using $(PYTHON). Otherwise it won't use the
Python interpreter
which was specified when configure was called with
--python=PYTHON-INTERPRETER.

wrong: hw/i386/Makefile.objs:  $(call quiet-command, $(SRC_PATH)/scripts/...

correct: hw/i386/Makefile.objs:  $(call quiet-command, $(PYTHON)
$(SRC_PATH)/scripts/...

This should be fixed for QEMU 1.7 (send patch with [PATCH for 1.7]).

Stefan

>
> Signed-off-by: Luigi Rizzo <rizzo@iet.unipi.it
> <mailto:rizzo@iet.unipi.it>>
> ---
>  scripts/acpi_extract.py | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/scripts/acpi_extract.py b/scripts/acpi_extract.py
> index 22ea468..66c1b3e 100755
> --- a/scripts/acpi_extract.py
> +++ b/scripts/acpi_extract.py
> @@ -1,4 +1,4 @@
> -#!/usr/bin/python
> +#!/usr/bin/env python
>  # Copyright (C) 2011 Red Hat, Inc., Michael S. Tsirkin
> <mst@redhat.com <mailto:mst@redhat.com>>
>  #
>  # This program is free software; you can redistribute it and/or modify
> --
> 1.8.1.2
>


[-- Attachment #2: Type: text/html, Size: 5208 bytes --]

Re: [Qemu-devel] [PATCH] better interpreter specification for scripts

[Stefan Weil]

[-- Attachment #1: Type: text/plain, Size: 1541 bytes --]

Am 15.11.2013 07:51, schrieb Luigi Rizzo:
> some of the new scripts in scripts/ specify a interpreter path
> which is not always pointing to the right place.
> I see that an alternative format is also being used
>         #!/usr/bin/env <interpreter_name>
> which seems to work better.
>
> The patch below is merely to let master compile on FreeBSD,
> but there are other offending files that can be found with
>  grep '#!' scripts/*

There is no need to fix acpi_extract.py here, because the error is in
hw/i386/Makefile.objs:

It should call the script using $(PYTHON). Otherwise it won't use the
Python interpreter
which was specified when configure was called with
--python=PYTHON-INTERPRETER.

wrong: hw/i386/Makefile.objs:  $(call quiet-command, $(SRC_PATH)/scripts/...

correct: hw/i386/Makefile.objs:  $(call quiet-command, $(PYTHON)
$(SRC_PATH)/scripts/...

This should be fixed for QEMU 1.7 (send patch with [PATCH for 1.7]).

Stefan

>
> Signed-off-by: Luigi Rizzo <rizzo@iet.unipi.it
> <mailto:rizzo@iet.unipi.it>>
> ---
>  scripts/acpi_extract.py | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/scripts/acpi_extract.py b/scripts/acpi_extract.py
> index 22ea468..66c1b3e 100755
> --- a/scripts/acpi_extract.py
> +++ b/scripts/acpi_extract.py
> @@ -1,4 +1,4 @@
> -#!/usr/bin/python
> +#!/usr/bin/env python
>  # Copyright (C) 2011 Red Hat, Inc., Michael S. Tsirkin
> <mst@redhat.com <mailto:mst@redhat.com>>
>  #
>  # This program is free software; you can redistribute it and/or modify
> --
> 1.8.1.2
>


[-- Attachment #2: Type: text/html, Size: 5208 bytes --]