scripts/update-linux-headers.sh: Fix the path of setup_data.h

[PATCH] scripts/update-linux-headers.sh: Fix the path of setup_data.h

Posted by Thomas Huth 1 year, 8 months ago

When running the update-linx-headers.sh script, it currently fails with:

scripts/update-linux-headers.sh: line 73: .../qemu/standard-headers/asm-x86/setup_data.h: No such file or directory

The "include" folder is obviously missing here - no clue how this could
have worked before?

Fixes: 66210a1a30 ("scripts/update-linux-headers: Add setup_data.h to import list")
Signed-off-by: Thomas Huth <thuth@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 fbf7e119bc..23afe8c08a 100755
--- a/scripts/update-linux-headers.sh
+++ b/scripts/update-linux-headers.sh
@@ -159,7 +159,7 @@ for arch in $ARCHLIST; do
         cp_portable "$hdrdir/bootparam.h" \
                     "$output/include/standard-headers/asm-$arch"
         cp_portable "$hdrdir/include/asm/setup_data.h" \
-                    "$output/standard-headers/asm-x86"
+                    "$output/include/standard-headers/asm-x86"
     fi
     if [ $arch = riscv ]; then
         cp "$hdrdir/include/asm/ptrace.h" "$output/linux-headers/asm-riscv/"
-- 
2.45.1

Re: [PATCH] scripts/update-linux-headers.sh: Fix the path of setup_data.h

Posted by Michael S. Tsirkin 1 year, 8 months ago

On Mon, May 27, 2024 at 08:01:26AM +0200, Thomas Huth wrote:
> When running the update-linx-headers.sh script, it currently fails with:
> 
> scripts/update-linux-headers.sh: line 73: .../qemu/standard-headers/asm-x86/setup_data.h: No such file or directory
> 
> The "include" folder is obviously missing here - no clue how this could
> have worked before?
> 
> Fixes: 66210a1a30 ("scripts/update-linux-headers: Add setup_data.h to import list")
> Signed-off-by: Thomas Huth <thuth@redhat.com>


Reviewed-by: Michael S. Tsirkin <mst@redhat.com>



Paolo you merged the offending patch wanna merge this one?

> ---
>  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 fbf7e119bc..23afe8c08a 100755
> --- a/scripts/update-linux-headers.sh
> +++ b/scripts/update-linux-headers.sh
> @@ -159,7 +159,7 @@ for arch in $ARCHLIST; do
>          cp_portable "$hdrdir/bootparam.h" \
>                      "$output/include/standard-headers/asm-$arch"
>          cp_portable "$hdrdir/include/asm/setup_data.h" \
> -                    "$output/standard-headers/asm-x86"
> +                    "$output/include/standard-headers/asm-x86"
>      fi
>      if [ $arch = riscv ]; then
>          cp "$hdrdir/include/asm/ptrace.h" "$output/linux-headers/asm-riscv/"
> -- 
> 2.45.1

Re: [PATCH] scripts/update-linux-headers.sh: Fix the path of setup_data.h

Posted by Michael Roth 1 year, 8 months ago

On Mon, May 27, 2024 at 08:01:26AM +0200, Thomas Huth wrote:
> When running the update-linx-headers.sh script, it currently fails with:
> 
> scripts/update-linux-headers.sh: line 73: .../qemu/standard-headers/asm-x86/setup_data.h: No such file or directory
> 
> The "include" folder is obviously missing here - no clue how this could
> have worked before?
> 
> Fixes: 66210a1a30 ("scripts/update-linux-headers: Add setup_data.h to import list")
> Signed-off-by: Thomas Huth <thuth@redhat.com>

Tested-by: Michael Roth <michael.roth@amd.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 fbf7e119bc..23afe8c08a 100755
> --- a/scripts/update-linux-headers.sh
> +++ b/scripts/update-linux-headers.sh
> @@ -159,7 +159,7 @@ for arch in $ARCHLIST; do
>          cp_portable "$hdrdir/bootparam.h" \
>                      "$output/include/standard-headers/asm-$arch"
>          cp_portable "$hdrdir/include/asm/setup_data.h" \
> -                    "$output/standard-headers/asm-x86"
> +                    "$output/include/standard-headers/asm-x86"
>      fi
>      if [ $arch = riscv ]; then
>          cp "$hdrdir/include/asm/ptrace.h" "$output/linux-headers/asm-riscv/"
> -- 
> 2.45.1
>

Re: [PATCH] scripts/update-linux-headers.sh: Fix the path of setup_data.h

Posted by Cornelia Huck 1 year, 8 months ago

On Mon, May 27 2024, Thomas Huth <thuth@redhat.com> wrote:

> When running the update-linx-headers.sh script, it currently fails with:
>
> scripts/update-linux-headers.sh: line 73: .../qemu/standard-headers/asm-x86/setup_data.h: No such file or directory
>
> The "include" folder is obviously missing here - no clue how this could
> have worked before?

Presumably nobody tried to run the script against a 6.9-ish kernel?

>
> Fixes: 66210a1a30 ("scripts/update-linux-headers: Add setup_data.h to import list")
> Signed-off-by: Thomas Huth <thuth@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 fbf7e119bc..23afe8c08a 100755
> --- a/scripts/update-linux-headers.sh
> +++ b/scripts/update-linux-headers.sh
> @@ -159,7 +159,7 @@ for arch in $ARCHLIST; do
>          cp_portable "$hdrdir/bootparam.h" \
>                      "$output/include/standard-headers/asm-$arch"
>          cp_portable "$hdrdir/include/asm/setup_data.h" \
> -                    "$output/standard-headers/asm-x86"
> +                    "$output/include/standard-headers/asm-x86"
>      fi
>      if [ $arch = riscv ]; then
>          cp "$hdrdir/include/asm/ptrace.h" "$output/linux-headers/asm-riscv/"

Reviewed-by: Cornelia Huck <cohuck@redhat.com>