| 1 |
commit: 0254a02c985973583c21db71b308d3b6bf93cf2b |
| 2 |
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jan 11 13:32:11 2022 +0000 |
| 4 |
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jan 11 13:40:41 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0254a02c |
| 7 |
|
| 8 |
app-emulation/qemu: always build virtfs-proxy-helper tool |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.30, Repoman-3.0.3 |
| 11 |
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org> |
| 12 |
|
| 13 |
...qemu-6.2.0-also-build-virtfs-proxy-helper.patch | 32 ++++++++++++++++++++++ |
| 14 |
.../{qemu-6.2.0-r2.ebuild => qemu-6.2.0-r3.ebuild} | 1 + |
| 15 |
app-emulation/qemu/qemu-9999.ebuild | 1 + |
| 16 |
3 files changed, 34 insertions(+) |
| 17 |
|
| 18 |
diff --git a/app-emulation/qemu/files/qemu-6.2.0-also-build-virtfs-proxy-helper.patch b/app-emulation/qemu/files/qemu-6.2.0-also-build-virtfs-proxy-helper.patch |
| 19 |
new file mode 100644 |
| 20 |
index 000000000000..b6af46552fe5 |
| 21 |
--- /dev/null |
| 22 |
+++ b/app-emulation/qemu/files/qemu-6.2.0-also-build-virtfs-proxy-helper.patch |
| 23 |
@@ -0,0 +1,32 @@ |
| 24 |
+From 42e53a0aadb76dfa7c11cd3b14eb4a41efba9bbe Mon Sep 17 00:00:00 2001 |
| 25 |
+From: Matthias Maier <tamiko@××××.org> |
| 26 |
+Date: Tue, 11 Jan 2022 07:20:31 -0600 |
| 27 |
+Subject: [PATCH] also build virtfs-proxy-helper |
| 28 |
+ |
| 29 |
+The Gentoo ebuild splits the qemu build into a softmmu, user and tool |
| 30 |
+phase in order to be able to build and link some of the qemu emulators |
| 31 |
+statically. This unfortunately has the consequence that we never |
| 32 |
+configure with "have_virtfs" and "have_tools" at the same time. |
| 33 |
+ |
| 34 |
+As a workaround, simply build the virtfs userland unconditionally. After |
| 35 |
+all, it is a tiny executable |
| 36 |
+--- |
| 37 |
+ meson.build | 2 +- |
| 38 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
| 39 |
+ |
| 40 |
+diff --git a/meson.build b/meson.build |
| 41 |
+index fbe856700..d6918b04c 100644 |
| 42 |
+--- a/meson.build |
| 43 |
++++ b/meson.build |
| 44 |
+@@ -1390,7 +1390,7 @@ have_virtfs = (targetos == 'linux' and |
| 45 |
+ libattr.found() and |
| 46 |
+ libcap_ng.found()) |
| 47 |
+ |
| 48 |
+-have_virtfs_proxy_helper = have_virtfs and have_tools |
| 49 |
++have_virtfs_proxy_helper = have_tools |
| 50 |
+ |
| 51 |
+ if get_option('virtfs').enabled() |
| 52 |
+ if not have_virtfs |
| 53 |
+-- |
| 54 |
+2.34.1 |
| 55 |
+ |
| 56 |
|
| 57 |
diff --git a/app-emulation/qemu/qemu-6.2.0-r2.ebuild b/app-emulation/qemu/qemu-6.2.0-r3.ebuild |
| 58 |
similarity index 99% |
| 59 |
rename from app-emulation/qemu/qemu-6.2.0-r2.ebuild |
| 60 |
rename to app-emulation/qemu/qemu-6.2.0-r3.ebuild |
| 61 |
index 10b0bf44d7de..6ca062e88457 100644 |
| 62 |
--- a/app-emulation/qemu/qemu-6.2.0-r2.ebuild |
| 63 |
+++ b/app-emulation/qemu/qemu-6.2.0-r3.ebuild |
| 64 |
@@ -279,6 +279,7 @@ PATCHES=( |
| 65 |
"${FILESDIR}"/${PN}-6.0.0-make.patch |
| 66 |
"${FILESDIR}"/${PN}-6.1.0-strings.patch |
| 67 |
"${FILESDIR}"/${PN}-6.2.0-user-SLIC-crash.patch |
| 68 |
+ "${FILESDIR}"/${PN}-6.2.0-also-build-virtfs-proxy-helper.patch |
| 69 |
) |
| 70 |
|
| 71 |
QA_PREBUILT=" |
| 72 |
|
| 73 |
diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild |
| 74 |
index 7f3efa61e35b..d81060ed102b 100644 |
| 75 |
--- a/app-emulation/qemu/qemu-9999.ebuild |
| 76 |
+++ b/app-emulation/qemu/qemu-9999.ebuild |
| 77 |
@@ -278,6 +278,7 @@ PATCHES=( |
| 78 |
"${FILESDIR}"/${PN}-5.2.0-disable-keymap.patch |
| 79 |
"${FILESDIR}"/${PN}-6.0.0-make.patch |
| 80 |
"${FILESDIR}"/${PN}-6.1.0-strings.patch |
| 81 |
+ "${FILESDIR}"/${PN}-6.2.0-also-build-virtfs-proxy-helper.patch |
| 82 |
) |
| 83 |
|
| 84 |
QA_PREBUILT=" |
Archives