diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2023-05-24 09:53:16 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-05-25 12:36:00 +0100 |
| commit | 829580b5545e31eb126d402d9f7fcfdb9f69e5e3 (patch) | |
| tree | fe61b1944f5cae6f967eeee3b64a4b70c8d0ce84 | |
| parent | 58061d15ebd02ed2c78e09e855f18602e83a19a3 (diff) | |
| download | poky-829580b5545e31eb126d402d9f7fcfdb9f69e5e3.tar.gz | |
qemu: remove unused qemu-7.0.0-glibc-2.36.patch
* it was removed from SRC_URI in:
https://git.openembedded.org/openembedded-core/commit/?id=e94d182889ca3c02df913c59f0b66b228ffe588c
(From OE-Core rev: 351c461859df02118e9fadb57320120dfbcd97eb)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-devtools/qemu/qemu/qemu-7.0.0-glibc-2.36.patch | 46 |
1 files changed, 0 insertions, 46 deletions
diff --git a/meta/recipes-devtools/qemu/qemu/qemu-7.0.0-glibc-2.36.patch b/meta/recipes-devtools/qemu/qemu/qemu-7.0.0-glibc-2.36.patch deleted file mode 100644 index abad1cfeeb..0000000000 --- a/meta/recipes-devtools/qemu/qemu/qemu-7.0.0-glibc-2.36.patch +++ /dev/null | |||
| @@ -1,46 +0,0 @@ | |||
| 1 | Avoid conflicts between sys/mount.h and linux/mount.h that are seen | ||
| 2 | with glibc 2.36 | ||
| 3 | |||
| 4 | Source: https://github.com/archlinux/svntogit-packages/blob/packages/qemu/trunk/qemu-7.0.0-glibc-2.36.patch | ||
| 5 | |||
| 6 | Upstream-Status: Pending | ||
| 7 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 8 | --- a/linux-user/syscall.c | ||
| 9 | +++ b/linux-user/syscall.c | ||
| 10 | @@ -95,7 +95,25 @@ | ||
| 11 | #include <linux/soundcard.h> | ||
| 12 | #include <linux/kd.h> | ||
| 13 | #include <linux/mtio.h> | ||
| 14 | + | ||
| 15 | +#ifdef HAVE_SYS_MOUNT_FSCONFIG | ||
| 16 | +/* | ||
| 17 | + * glibc >= 2.36 linux/mount.h conflicts with sys/mount.h, | ||
| 18 | + * which in turn prevents use of linux/fs.h. So we have to | ||
| 19 | + * define the constants ourselves for now. | ||
| 20 | + */ | ||
| 21 | +#define FS_IOC_GETFLAGS _IOR('f', 1, long) | ||
| 22 | +#define FS_IOC_SETFLAGS _IOW('f', 2, long) | ||
| 23 | +#define FS_IOC_GETVERSION _IOR('v', 1, long) | ||
| 24 | +#define FS_IOC_SETVERSION _IOW('v', 2, long) | ||
| 25 | +#define FS_IOC_FIEMAP _IOWR('f', 11, struct fiemap) | ||
| 26 | +#define FS_IOC32_GETFLAGS _IOR('f', 1, int) | ||
| 27 | +#define FS_IOC32_SETFLAGS _IOW('f', 2, int) | ||
| 28 | +#define FS_IOC32_GETVERSION _IOR('v', 1, int) | ||
| 29 | +#define FS_IOC32_SETVERSION _IOW('v', 2, int) | ||
| 30 | +#else | ||
| 31 | #include <linux/fs.h> | ||
| 32 | +#endif | ||
| 33 | #include <linux/fd.h> | ||
| 34 | #if defined(CONFIG_FIEMAP) | ||
| 35 | #include <linux/fiemap.h> | ||
| 36 | --- a/meson.build | ||
| 37 | +++ b/meson.build | ||
| 38 | @@ -1686,6 +1686,8 @@ config_host_data.set('HAVE_OPTRESET', | ||
| 39 | cc.has_header_symbol('getopt.h', 'optreset')) | ||
| 40 | config_host_data.set('HAVE_IPPROTO_MPTCP', | ||
| 41 | cc.has_header_symbol('netinet/in.h', 'IPPROTO_MPTCP')) | ||
| 42 | +config_host_data.set('HAVE_SYS_MOUNT_FSCONFIG', | ||
| 43 | + cc.has_header_symbol('sys/mount.h', 'FSCONFIG_SET_FLAG')) | ||
| 44 | |||
| 45 | # has_member | ||
| 46 | config_host_data.set('HAVE_SIGEV_NOTIFY_THREAD_ID', | ||
