Commit f717e624 authored by Paolo Bonzini's avatar Paolo Bonzini Committed by Peter Maydell
Browse files

update-linux-headers: update for 4.11 



The linux-headers/asm-arm/unistd.h file has been split in three
sub-files, copy them along.  However, building them requires
setting ARCH rather than SRCARCH.

SRCARCH defaults to $(ARCH) anyway; to avoid future occurrence of
the same problem use ARCH for all architectures where SRCARCH=ARCH.
Currently these are all except x86, sparc, sh and tile.

Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Message-id: 20170221122920.16245-2-pbonzini@redhat.com
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent 8a85e065

scripts/update-linux-headers.sh

+12 −1
Original line number Diff line number Diff line
@@ -75,7 +75,13 @@ for arch in $ARCHLIST; do 
        continue

    fi



    make -C "$linux" INSTALL_HDR_PATH="$tmpdir" SRCARCH=$arch headers_install

    if [ "$arch" = x86 ]; then

        arch_var=SRCARCH

    else

        arch_var=ARCH

    fi



    make -C "$linux" INSTALL_HDR_PATH="$tmpdir" $arch_var=$arch headers_install



    rm -rf "$output/linux-headers/asm-$arch"

    mkdir -p "$output/linux-headers/asm-$arch"
@@ -92,6 +98,11 @@ for arch in $ARCHLIST; do 
        cp_portable "$tmpdir/include/asm/kvm_virtio.h" "$output/include/standard-headers/asm-s390/"

        cp_portable "$tmpdir/include/asm/virtio-ccw.h" "$output/include/standard-headers/asm-s390/"

    fi

    if [ $arch = arm ]; then

        cp "$tmpdir/include/asm/unistd-eabi.h" "$output/linux-headers/asm-arm/"

        cp "$tmpdir/include/asm/unistd-oabi.h" "$output/linux-headers/asm-arm/"

        cp "$tmpdir/include/asm/unistd-common.h" "$output/linux-headers/asm-arm/"

    fi

    if [ $arch = x86 ]; then

        cp_portable "$tmpdir/include/asm/hyperv.h" "$output/include/standard-headers/asm-x86/"

        cp "$tmpdir/include/asm/unistd_32.h" "$output/linux-headers/asm-x86/"