Skip to content

Commit

Permalink
contrib/qemu: enable bpf, dw, fix uring enablement, disable oss
Browse files Browse the repository at this point in the history
  • Loading branch information
nekopsykose authored and q66 committed Jul 6, 2024
1 parent 36d6bac commit c5d29e3
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 6 deletions.
13 changes: 13 additions & 0 deletions contrib/qemu/patches/liburine.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
detection of this fails without gnusource
--
--- a/meson.build
+++ b/meson.build
@@ -1004,7 +1004,7 @@
linux_io_uring = dependency('liburing', version: '>=0.3',
required: get_option('linux_io_uring'),
method: 'pkg-config')
- if not cc.links(linux_io_uring_test)
+ if not cc.links(linux_io_uring_test, args: ['-D_GNU_SOURCE'])
linux_io_uring = not_found
endif
endif
22 changes: 16 additions & 6 deletions contrib/qemu/template.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,18 @@
build_style = "gnu_configure"
# TODO vde
configure_args = [
"--enable-bpf",
"--enable-cap-ng",
"--enable-capstone",
"--enable-curl",
"--enable-curses",
"--enable-dbus-display",
"--enable-docs",
"--enable-gtk",
"--enable-guest-agent",
"--enable-jack",
"--enable-gtk",
"--enable-kvm",
"--enable-libdw",
"--enable-libnfs",
"--enable-libssh",
"--enable-linux-aio",
Expand All @@ -25,18 +27,19 @@
"--enable-seccomp",
"--enable-snappy",
"--enable-system",
"--enable-vhost-net",
"--enable-virtfs",
"--enable-tpm",
"--enable-usb-redir",
"--enable-vhost-net",
"--enable-virglrenderer",
"--enable-virtfs",
"--enable-vnc",
"--enable-vnc-jpeg",
"--enable-zstd",
"--disable-linux-user",
"--disable-glusterfs",
"--disable-debug-info",
"--disable-bsd-user",
"--disable-debug-info",
"--disable-glusterfs",
"--disable-linux-user",
"--disable-oss",
"--disable-werror",
"--disable-xen",
"--audio-drv-list=pa,pipewire,jack,sdl",
Expand All @@ -60,11 +63,13 @@
"bzip2-devel",
"capstone-devel",
"dtc-devel",
"elfutils-devel",
"fuse-devel",
"glib-devel",
"gnutls-devel",
"gtk+3-devel",
"libaio-devel",
"libbpf-devel",
"libcacard-devel",
"libcap-ng-devel",
"libcurl-devel",
Expand Down Expand Up @@ -102,6 +107,11 @@
url = "https://qemu.org"
source = f"https://download.qemu.org/qemu-{pkgver}.tar.xz"
sha256 = "d0f4db0fbd151c0cf16f84aeb2a500f6e95009732546f44dafab8d2049bbb805"
tool_flags = {
# see libbpf comment about bpf headers
"CFLAGS": ["-I/usr/include/bpf/uapi"],
"CXXFLAGS": ["-I/usr/include/bpf/uapi"],
}
file_modes = {
"etc/qemu/bridge.conf": ("root", "_qemu", 0o640),
"usr/libexec/qemu-bridge-helper": ("root", "_qemu", 0o4710),
Expand Down

0 comments on commit c5d29e3

Please sign in to comment.