[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 12/21] update-linux-headers: update for 4.11
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PULL 12/21] update-linux-headers: update for 4.11 |
Date: |
Tue, 28 Feb 2017 17:16:07 +0000 |
From: Paolo Bonzini <address@hidden>
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: Paolo Bonzini <address@hidden>
Message-id: address@hidden
Signed-off-by: Peter Maydell <address@hidden>
---
scripts/update-linux-headers.sh | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/scripts/update-linux-headers.sh b/scripts/update-linux-headers.sh
index 72cf1fb..6a370a8 100755
--- a/scripts/update-linux-headers.sh
+++ b/scripts/update-linux-headers.sh
@@ -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/"
--
2.7.4
- [Qemu-devel] [PULL 09/21] armv7m: Split systick out from NVIC, (continued)
- [Qemu-devel] [PULL 09/21] armv7m: Split systick out from NVIC, Peter Maydell, 2017/02/28
- [Qemu-devel] [PULL 21/21] bcm2835: add sdhost and gpio controllers, Peter Maydell, 2017/02/28
- [Qemu-devel] [PULL 15/21] hw/intc/arm_gicv3_kvm: Implement get/put functions, Peter Maydell, 2017/02/28
- [Qemu-devel] [PULL 10/21] stm32f205: Create armv7m object without using armv7m_init(), Peter Maydell, 2017/02/28
- [Qemu-devel] [PULL 14/21] hw/intc/arm_gicv3_kvm: Add ICC_SRE_EL1 register to vmstate, Peter Maydell, 2017/02/28
- [Qemu-devel] [PULL 16/21] target-arm: Add GICv3CPUState in CPUARMState struct, Peter Maydell, 2017/02/28
- [Qemu-devel] [PULL 19/21] hw/sd: add card-reparenting function, Peter Maydell, 2017/02/28
- [Qemu-devel] [PULL 20/21] bcm2835_gpio: add bcm2835 gpio controller, Peter Maydell, 2017/02/28
- [Qemu-devel] [PULL 06/21] armv7m: Make NVIC expose a memory region rather than mapping itself, Peter Maydell, 2017/02/28
- [Qemu-devel] [PULL 13/21] update Linux headers to 4.11, Peter Maydell, 2017/02/28
- [Qemu-devel] [PULL 12/21] update-linux-headers: update for 4.11,
Peter Maydell <=