[Qemu-devel] [PATCH] fix scripts/update-linux-headers.sh here document

Gerd Hoffmann posted 1 patch 6 years, 4 months ago
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20171110090354.29608-1-kraxel@redhat.com
Test checkpatch passed
Test docker passed
Test ppc passed
Test s390x passed
scripts/update-linux-headers.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
[Qemu-devel] [PATCH] fix scripts/update-linux-headers.sh here document
Posted by Gerd Hoffmann 6 years, 4 months ago
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 scripts/update-linux-headers.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/update-linux-headers.sh b/scripts/update-linux-headers.sh
index 8b847e279b..e2b159aa3d 100755
--- a/scripts/update-linux-headers.sh
+++ b/scripts/update-linux-headers.sh
@@ -108,7 +108,7 @@ for arch in $ARCHLIST; do
     if [ $arch = x86 ]; then
         cat <<-EOF >"$output/include/standard-headers/asm-x86/hyperv.h"
         /* this is a temporary placeholder until kvm_para.h stops including it */
-        EOF
+EOF
         cp "$tmpdir/include/asm/unistd_32.h" "$output/linux-headers/asm-x86/"
         cp "$tmpdir/include/asm/unistd_x32.h" "$output/linux-headers/asm-x86/"
         cp "$tmpdir/include/asm/unistd_64.h" "$output/linux-headers/asm-x86/"
-- 
2.9.3


Re: [Qemu-devel] [PATCH] fix scripts/update-linux-headers.sh here document
Posted by Stefan Hajnoczi 6 years, 4 months ago
On Fri, Nov 10, 2017 at 10:03:54AM +0100, Gerd Hoffmann wrote:
> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
> ---
>  scripts/update-linux-headers.sh | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Re: [Qemu-devel] [PATCH] fix scripts/update-linux-headers.sh here document
Posted by Roman Kagan 6 years, 4 months ago
On Fri, Nov 10, 2017 at 10:03:54AM +0100, Gerd Hoffmann wrote:
> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
> ---
>  scripts/update-linux-headers.sh | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/scripts/update-linux-headers.sh b/scripts/update-linux-headers.sh
> index 8b847e279b..e2b159aa3d 100755
> --- a/scripts/update-linux-headers.sh
> +++ b/scripts/update-linux-headers.sh
> @@ -108,7 +108,7 @@ for arch in $ARCHLIST; do
>      if [ $arch = x86 ]; then
>          cat <<-EOF >"$output/include/standard-headers/asm-x86/hyperv.h"
>          /* this is a temporary placeholder until kvm_para.h stops including it */
> -        EOF
> +EOF
>          cp "$tmpdir/include/asm/unistd_32.h" "$output/linux-headers/asm-x86/"
>          cp "$tmpdir/include/asm/unistd_x32.h" "$output/linux-headers/asm-x86/"
>          cp "$tmpdir/include/asm/unistd_64.h" "$output/linux-headers/asm-x86/"

Ugh, indeed, the minus sign after << causes the shell to strip only
preceding tabs, not spaces.  Apparently I expanded the tabs after I
tested the script to work...

Fixes: 40bf8e9aede0f9105a9e1e4aaf17b20aaa55f9a0
Reviewed-by: Roman Kagan <rkagan@virtuozzo.com>

Thanks,
Roman.

Re: [Qemu-devel] [PATCH] fix scripts/update-linux-headers.sh here document
Posted by Christian Borntraeger 6 years, 4 months ago
On 11/10/2017 10:03 AM, Gerd Hoffmann wrote:
> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>

Tested-by: Christian Borntraeger <borntraeger@de.ibm.com>

> ---
>  scripts/update-linux-headers.sh | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/scripts/update-linux-headers.sh b/scripts/update-linux-headers.sh
> index 8b847e279b..e2b159aa3d 100755
> --- a/scripts/update-linux-headers.sh
> +++ b/scripts/update-linux-headers.sh
> @@ -108,7 +108,7 @@ for arch in $ARCHLIST; do
>      if [ $arch = x86 ]; then
>          cat <<-EOF >"$output/include/standard-headers/asm-x86/hyperv.h"
>          /* this is a temporary placeholder until kvm_para.h stops including it */
> -        EOF
> +EOF
>          cp "$tmpdir/include/asm/unistd_32.h" "$output/linux-headers/asm-x86/"
>          cp "$tmpdir/include/asm/unistd_x32.h" "$output/linux-headers/asm-x86/"
>          cp "$tmpdir/include/asm/unistd_64.h" "$output/linux-headers/asm-x86/"
> 


Re: [Qemu-devel] [PATCH] fix scripts/update-linux-headers.sh here document
Posted by Paolo Bonzini 6 years, 4 months ago
On 10/11/2017 10:03, Gerd Hoffmann wrote:
> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
> ---
>  scripts/update-linux-headers.sh | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/scripts/update-linux-headers.sh b/scripts/update-linux-headers.sh
> index 8b847e279b..e2b159aa3d 100755
> --- a/scripts/update-linux-headers.sh
> +++ b/scripts/update-linux-headers.sh
> @@ -108,7 +108,7 @@ for arch in $ARCHLIST; do
>      if [ $arch = x86 ]; then
>          cat <<-EOF >"$output/include/standard-headers/asm-x86/hyperv.h"
>          /* this is a temporary placeholder until kvm_para.h stops including it */
> -        EOF
> +EOF
>          cp "$tmpdir/include/asm/unistd_32.h" "$output/linux-headers/asm-x86/"
>          cp "$tmpdir/include/asm/unistd_x32.h" "$output/linux-headers/asm-x86/"
>          cp "$tmpdir/include/asm/unistd_64.h" "$output/linux-headers/asm-x86/"
> 

Queued, thanks.

Paolo