| 1 |
commit: 991a095934c0cf12cc9aa4420a67a321b1d4e9a2 |
| 2 |
Author: Michal Privoznik <mprivozn <AT> redhat <DOT> com> |
| 3 |
AuthorDate: Mon Apr 4 11:08:12 2022 +0000 |
| 4 |
Commit: John Helmert III <ajak <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Apr 4 18:44:34 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=991a0959 |
| 7 |
|
| 8 |
app-emulation/qemu: Rebase qemu-6.2.0-also-build-virtfs-proxy-helper.patch for live ebuild |
| 9 |
|
| 10 |
Since the upstream moved some stuff in meson.build the original |
| 11 |
patch applies no more. Rebase it onto current master. |
| 12 |
|
| 13 |
Signed-off-by: Michal Privoznik <mprivozn <AT> redhat.com> |
| 14 |
Closes: https://github.com/gentoo/gentoo/pull/24898 |
| 15 |
Signed-off-by: John Helmert III <ajak <AT> gentoo.org> |
| 16 |
|
| 17 |
...qemu-7.0.0-also-build-virtfs-proxy-helper.patch | 32 ++++++++++++++++++++++ |
| 18 |
app-emulation/qemu/qemu-9999.ebuild | 2 +- |
| 19 |
2 files changed, 33 insertions(+), 1 deletion(-) |
| 20 |
|
| 21 |
diff --git a/app-emulation/qemu/files/qemu-7.0.0-also-build-virtfs-proxy-helper.patch b/app-emulation/qemu/files/qemu-7.0.0-also-build-virtfs-proxy-helper.patch |
| 22 |
new file mode 100644 |
| 23 |
index 000000000000..ca2e9433792c |
| 24 |
--- /dev/null |
| 25 |
+++ b/app-emulation/qemu/files/qemu-7.0.0-also-build-virtfs-proxy-helper.patch |
| 26 |
@@ -0,0 +1,32 @@ |
| 27 |
+From c1093041466772f4b62961bcc5a354801d41355d Mon Sep 17 00:00:00 2001 |
| 28 |
+From: Matthias Maier <tamiko@××××.org> |
| 29 |
+Date: Mon, 4 Apr 2022 12:56:59 +0200 |
| 30 |
+Subject: [PATCH] also build virtfs-proxy-helper |
| 31 |
+ |
| 32 |
+The Gentoo ebuild splits the qemu build into a softmmu, user and tool |
| 33 |
+phase in order to be able to build and link some of the qemu emulators |
| 34 |
+statically. This unfortunately has the consequence that we never |
| 35 |
+configure with "have_virtfs" and "have_tools" at the same time. |
| 36 |
+ |
| 37 |
+As a workaround, simply build the virtfs userland unconditionally. After |
| 38 |
+all, it is a tiny executable |
| 39 |
+--- |
| 40 |
+ meson.build | 2 +- |
| 41 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
| 42 |
+ |
| 43 |
+diff --git a/meson.build b/meson.build |
| 44 |
+index 861de93c4f..a8d29be3aa 100644 |
| 45 |
+--- a/meson.build |
| 46 |
++++ b/meson.build |
| 47 |
+@@ -1474,7 +1474,7 @@ have_virtfs = get_option('virtfs') \ |
| 48 |
+ .disable_auto_if(not have_tools and not have_system) \ |
| 49 |
+ .allowed() |
| 50 |
+ |
| 51 |
+-have_virtfs_proxy_helper = targetos != 'darwin' and have_virtfs and have_tools |
| 52 |
++have_virtfs_proxy_helper = have_tools and libattr.found() and libcap_ng.found() |
| 53 |
+ |
| 54 |
+ foreach k : get_option('trace_backends') |
| 55 |
+ config_host_data.set('CONFIG_TRACE_' + k.to_upper(), true) |
| 56 |
+-- |
| 57 |
+2.35.1 |
| 58 |
+ |
| 59 |
|
| 60 |
diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild |
| 61 |
index 13179f417b18..a8468dde1909 100644 |
| 62 |
--- a/app-emulation/qemu/qemu-9999.ebuild |
| 63 |
+++ b/app-emulation/qemu/qemu-9999.ebuild |
| 64 |
@@ -276,7 +276,7 @@ PATCHES=( |
| 65 |
"${FILESDIR}"/${PN}-5.2.0-disable-keymap.patch |
| 66 |
"${FILESDIR}"/${PN}-6.0.0-make.patch |
| 67 |
"${FILESDIR}"/${PN}-6.1.0-strings.patch |
| 68 |
- "${FILESDIR}"/${PN}-6.2.0-also-build-virtfs-proxy-helper.patch |
| 69 |
+ "${FILESDIR}"/${PN}-7.0.0-also-build-virtfs-proxy-helper.patch |
| 70 |
) |
| 71 |
|
| 72 |
QA_PREBUILT=" |
Archives