]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core.git/commit
qemu: Fix building with 6.2 kernel headers
authorJoel Stanley <joel@jms.id.au>
Thu, 23 Feb 2023 00:26:32 +0000 (01:26 +0100)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Fri, 24 Feb 2023 11:03:45 +0000 (11:03 +0000)
commit65b1e199dcaabf93bae33e06727bb1238b703d83
tree1f2be4ee2d63dfd9b448a8e5f75bc90f9f6369cf
parentaaab4ffb4b17b222d1914d0feab286c4000b17da
qemu: Fix building with 6.2 kernel headers

When building native qemu with 6.2 kernel headers, qemu fails to build:

 In file included from /usr/include/linux/btrfs.h:29,
                  from ../qemu-7.2.0/linux-user/syscall.c:165:
 /usr/include/linux/fs.h:50:8: error: redefinition of ‘struct file_clone_range’
    50 | struct file_clone_range {
       |        ^~~~~~~~~~~~~~~~
 ../qemu-7.2.0/linux-user/syscall.c:129:8: note: originally defined here
   129 | struct file_clone_range {
       |        ^~~~~~~~~~~~~~~~

Backport changes to linux-user that remove the local copy of struct
file_clone_range.

Patches from https://lore.kernel.org/qemu-devel/20230110174901.2580297-1-berrange@redhat.com/

Signed-off-by: Joel Stanley <joel@jms.id.au>
Tested-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/recipes-devtools/qemu/qemu.inc
meta/recipes-devtools/qemu/qemu/0001-Revert-linux-user-add-more-compat-ioctl-definitions.patch [new file with mode: 0644]
meta/recipes-devtools/qemu/qemu/0002-Revert-linux-user-fix-compat-with-glibc-2.36-sys-mou.patch [new file with mode: 0644]