On 05/11/2018 06:32 PM, Michael S. Tsirkin wrote: > Rework the update script slightly, add the unistd.h header and its > dependencies on all architectures. > > This also removes the IA64 and MIPS from a KVM blacklist: > Linux dropped IA64, and there was never a reason to > exclude MIPS from kvm specifically - it was > excluded due to dependency of its unistd.h on sgidefs.h, > which we also import. > > Cc: Dr. David Alan Gilbert <dgilb...@redhat.com> > Signed-off-by: Michael S. Tsirkin <m...@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4...@amsat.org> > --- > scripts/update-linux-headers.sh | 18 ++++++++++++------ > 1 file changed, 12 insertions(+), 6 deletions(-) > > diff --git a/scripts/update-linux-headers.sh b/scripts/update-linux-headers.sh > index a017b53..7af5bb1 100755 > --- a/scripts/update-linux-headers.sh > +++ b/scripts/update-linux-headers.sh > @@ -84,11 +84,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 > @@ -99,9 +94,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; do > + for header in kvm.h unistd.h bitsperlong.h; do > cp "$tmpdir/include/asm/$header" "$output/linux-headers/asm-$arch" > done > + > + if [ $arch = mips ]; then > + cp "$tmpdir/include/asm/sgidefs.h" "$output/linux-headers/asm-mips/" > + fi > + > rm -rf "$output/include/standard-headers/asm-$arch" > mkdir -p "$output/include/standard-headers/asm-$arch" > if [ $arch = s390 ]; then > @@ -132,6 +132,12 @@ for header in kvm.h vfio.h vfio_ccw.h vhost.h \ > cp "$tmpdir/include/linux/$header" "$output/linux-headers/linux" > done > > +rm -rf "$output/linux-headers/asm-generic" > +mkdir -p "$output/linux-headers/asm-generic" > +for header in unistd.h bitsperlong.h; do > + cp "$tmpdir/include/asm-generic/$header" > "$output/linux-headers/asm-generic" > +done > + > if [ -L "$linux/source" ]; then > cp "$linux/source/COPYING" "$output/linux-headers" > else >
