Rework the update script slightly, add the unistd.h header and its dependencies on all architectures.
This also removes the IA64 from a KVM blacklist (Linux dropped this architecture for KVM), and adds a comment so we remember to try and un-blacklist KVM on MIPS. Signed-off-by: Michael S. Tsirkin <[email protected]> --- scripts/update-linux-headers.sh | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/scripts/update-linux-headers.sh b/scripts/update-linux-headers.sh index d18e2f1..0999ccf 100755 --- a/scripts/update-linux-headers.sh +++ b/scripts/update-linux-headers.sh @@ -80,11 +80,6 @@ for arch in $ARCHLIST; do continue fi - # Blacklist architectures which have KVM headers but are actually dead - if [ "$arch" = "ia64" -o "$arch" = "mips" ]; then - continue - fi - if [ "$arch" = x86 ]; then arch_var=SRCARCH else @@ -95,9 +90,20 @@ for arch in $ARCHLIST; do rm -rf "$output/linux-headers/asm-$arch" mkdir -p "$output/linux-headers/asm-$arch" - for header in kvm.h kvm_para.h unistd.h; do + for header in unistd.h bitsperlong.h; do cp "$tmpdir/include/asm/$header" "$output/linux-headers/asm-$arch" done + + # Below blacklists KVM on MIPS since we did this historically, even though + # KVM on MIPS is supposed to be properly supported these days. + # TODO: we should not be blacklisting it, but instead sorting out whatever + # issues it has that made us exclude it. + if [ "$arch" != "mips" ]; then + for header in kvm.h kvm_para.h; do + cp "$tmpdir/include/asm/$header" "$output/linux-headers/asm-$arch" + done + fi + if [ $arch = powerpc ]; then cp "$tmpdir/include/asm/epapr_hcalls.h" "$output/linux-headers/asm-powerpc/" fi @@ -130,7 +136,7 @@ for header in kvm.h kvm_para.h vfio.h vfio_ccw.h vhost.h \ done rm -rf "$output/linux-headers/asm-generic" mkdir -p "$output/linux-headers/asm-generic" -for header in kvm_para.h; do +for header in kvm_para.h bitsperlong.h unistd.h; do cp "$tmpdir/include/asm-generic/$header" "$output/linux-headers/asm-generic" done if [ -L "$linux/source" ]; then -- MST
