| 1 |
commit: c9060c3c166cdabb33564aba054fa1206c5b0b4d |
| 2 |
Author: Doug Goldstein <cardoe <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jan 28 01:07:50 2019 +0000 |
| 4 |
Commit: Doug Goldstein <cardoe <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jan 28 01:08:30 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9060c3c |
| 7 |
|
| 8 |
app-emulation/qemu: fix build with SOFTMMU_TARGETS empty |
| 9 |
|
| 10 |
When SOFTMMU_TARGETS are empty the qemu-bridge-helper isn't installed |
| 11 |
anymore causing a failure to build due to the fcaps call. |
| 12 |
|
| 13 |
Closes: https://bugs.gentoo.org/675110 |
| 14 |
Signed-off-by: Doug Goldstein <cardoe <AT> gentoo.org> |
| 15 |
Package-Manager: Portage-2.3.51, Repoman-2.3.11 |
| 16 |
|
| 17 |
app-emulation/qemu/qemu-3.1.0.ebuild | 3 ++- |
| 18 |
app-emulation/qemu/qemu-9999.ebuild | 3 ++- |
| 19 |
2 files changed, 4 insertions(+), 2 deletions(-) |
| 20 |
|
| 21 |
diff --git a/app-emulation/qemu/qemu-3.1.0.ebuild b/app-emulation/qemu/qemu-3.1.0.ebuild |
| 22 |
index 328afccf346..316cf892505 100644 |
| 23 |
--- a/app-emulation/qemu/qemu-3.1.0.ebuild |
| 24 |
+++ b/app-emulation/qemu/qemu-3.1.0.ebuild |
| 25 |
@@ -768,7 +768,8 @@ pkg_postinst() { |
| 26 |
udev_reload |
| 27 |
fi |
| 28 |
|
| 29 |
- fcaps cap_net_admin /usr/libexec/qemu-bridge-helper |
| 30 |
+ [[ -f ${D}/usr/libexec/qemu-bridge-helper ]] && \ |
| 31 |
+ fcaps cap_net_admin /usr/libexec/qemu-bridge-helper |
| 32 |
|
| 33 |
DISABLE_AUTOFORMATTING=true |
| 34 |
readme.gentoo_print_elog |
| 35 |
|
| 36 |
diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild |
| 37 |
index 1c99bc24161..7561f0f611c 100644 |
| 38 |
--- a/app-emulation/qemu/qemu-9999.ebuild |
| 39 |
+++ b/app-emulation/qemu/qemu-9999.ebuild |
| 40 |
@@ -760,7 +760,8 @@ pkg_postinst() { |
| 41 |
udev_reload |
| 42 |
fi |
| 43 |
|
| 44 |
- fcaps cap_net_admin /usr/libexec/qemu-bridge-helper |
| 45 |
+ [[ -f ${D}/usr/libexec/qemu-bridge-helper ]] && \ |
| 46 |
+ fcaps cap_net_admin /usr/libexec/qemu-bridge-helper |
| 47 |
|
| 48 |
DISABLE_AUTOFORMATTING=true |
| 49 |
readme.gentoo_print_elog |
Archives