Re: [PATCH 1/4] update-linux-headers: fix forwarding to asm-generic headers

[Thomas Huth]

On 03/06/2024 15.11, Paolo Bonzini wrote:
> Afer commit 3efc75ad9d9 ("scripts/update-linux-headers.sh: Remove
> temporary directory inbetween", 2024-05-29), updating linux-headers/
> results in errors such as
>
>     cp: cannot stat '/tmp/tmp.1A1Eejh1UE/headers/include/asm/bitsperlong.h': No 
> such file or directory

Oops, sorry, I was pretty sure the update was working for me when I tested 
the patch ... maybe I was on an older branch that didn't have loongarch 
support yet.

> diff --git a/scripts/update-linux-headers.sh b/scripts/update-linux-headers.sh
> index 23afe8c08ad..ae34d18572b 100755
> --- a/scripts/update-linux-headers.sh
> +++ b/scripts/update-linux-headers.sh
> @@ -118,7 +118,14 @@ for arch in $ARCHLIST; do
>       rm -rf "$output/linux-headers/asm-$arch"
>       mkdir -p "$output/linux-headers/asm-$arch"
>       for header in kvm.h unistd.h bitsperlong.h mman.h; do
> -        cp "$hdrdir/include/asm/$header" "$output/linux-headers/asm-$arch"
> +        if test -f "$hdrdir/include/asm/$header"; then
> +            cp "$hdrdir/include/asm/$header" "$output/linux-headers/asm-$arch"
> +        elif test -f "$hdrdir/include/asm-generic/$header"; then
> +            # not installed as <asm/bitsperlong.h>, but used as such in kernel 
> sources

Maybe change the comment to talk about <asm/$header> instead of 
<asm/bitsperlong.h> ?

> +            cat <<EOF >$output/linux-headers/asm-$arch/$header
> +#include <asm-generic/$header>
> +EOF
> +        fi
>       done
>   
>       if [ $arch = mips ]; then

Reviewed-by: Thomas Huth <thuth@redhat.com>