| 1 |
commit: d59fc9687651f5384667abe0e35b7e27a775e4dc |
| 2 |
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Apr 22 13:34:19 2021 +0000 |
| 4 |
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Apr 22 13:39:15 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d59fc968 |
| 7 |
|
| 8 |
app-emulation/libvirt: update live ebuild |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.18, Repoman-3.0.3 |
| 11 |
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org> |
| 12 |
|
| 13 |
app-emulation/libvirt/libvirt-9999.ebuild | 35 ++++++++++++------------------- |
| 14 |
1 file changed, 13 insertions(+), 22 deletions(-) |
| 15 |
|
| 16 |
diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild |
| 17 |
index 767580ad5f7..586aec96cbd 100644 |
| 18 |
--- a/app-emulation/libvirt/libvirt-9999.ebuild |
| 19 |
+++ b/app-emulation/libvirt/libvirt-9999.ebuild |
| 20 |
@@ -5,7 +5,7 @@ EAPI=7 |
| 21 |
|
| 22 |
PYTHON_COMPAT=( python3_{7,8,9} ) |
| 23 |
|
| 24 |
-inherit meson bash-completion-r1 eutils linux-info python-any-r1 readme.gentoo-r1 tmpfiles |
| 25 |
+inherit meson bash-completion-r1 linux-info python-any-r1 readme.gentoo-r1 tmpfiles |
| 26 |
|
| 27 |
if [[ ${PV} = *9999* ]]; then |
| 28 |
inherit git-r3 |
| 29 |
@@ -13,13 +13,14 @@ if [[ ${PV} = *9999* ]]; then |
| 30 |
SRC_URI="" |
| 31 |
SLOT="0" |
| 32 |
else |
| 33 |
- SRC_URI="https://libvirt.org/sources/${P}.tar.xz" |
| 34 |
+ SRC_URI="https://libvirt.org/sources/${P}.tar.xz |
| 35 |
+ verify-sig? ( https://libvirt.org/sources/${P}.tar.xz.asc )" |
| 36 |
KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" |
| 37 |
SLOT="0/${PV}" |
| 38 |
fi |
| 39 |
|
| 40 |
DESCRIPTION="C toolkit to manipulate virtual machines" |
| 41 |
-HOMEPAGE="https://www.libvirt.org/" |
| 42 |
+HOMEPAGE="https://www.libvirt.org/ https://gitlab.com/libvirt/libvirt/" |
| 43 |
LICENSE="LGPL-2.1" |
| 44 |
IUSE=" |
| 45 |
apparmor audit +caps dtrace firewalld fuse glusterfs iscsi |
| 46 |
@@ -197,13 +198,6 @@ pkg_setup() { |
| 47 |
~NET_SCH_INGRESS |
| 48 |
~NET_SCH_SFQ" |
| 49 |
|
| 50 |
- # Handle specific kernel versions for different features |
| 51 |
- kernel_is lt 3 6 && CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR" |
| 52 |
- if kernel_is ge 3 6; then |
| 53 |
- CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP " |
| 54 |
- kernel_is lt 4 5 && CONFIG_CHECK+=" ~MEMCG_KMEM " |
| 55 |
- fi |
| 56 |
- |
| 57 |
ERROR_USER_NS="Optional depending on LXC configuration." |
| 58 |
|
| 59 |
if [[ -n ${CONFIG_CHECK} ]]; then |
| 60 |
@@ -289,11 +283,15 @@ src_test() { |
| 61 |
src_install() { |
| 62 |
meson_src_install |
| 63 |
|
| 64 |
- # Remove bogus, empty directories. They are either not used, or |
| 65 |
- # libvirtd is able to create them on demand |
| 66 |
- rm -rf "${D}"/etc/sysconfig || die |
| 67 |
- rm -rf "${D}"/var || die |
| 68 |
- rm -rf "${D}"/run || die |
| 69 |
+ # Depending on configuration option, libvirt will create some bogus |
| 70 |
+ # directoreis. They are either not used, or libvirtd is able to create |
| 71 |
+ # them on demand, so let's remove them. |
| 72 |
+ # |
| 73 |
+ # Note, we are using -f here so that rm does not fail or warn if the |
| 74 |
+ # directory is nonexistent. |
| 75 |
+ rm -rf "${D}"/etc/sysconfig |
| 76 |
+ rm -rf "${D}"/var |
| 77 |
+ rm -rf "${D}"/run |
| 78 |
|
| 79 |
newbashcomp "${S}/tools/bash-completion/vsh" virsh |
| 80 |
bashcomp_alias virsh virt-admin |
| 81 |
@@ -316,13 +314,6 @@ src_install() { |
| 82 |
readme.gentoo_create_doc |
| 83 |
} |
| 84 |
|
| 85 |
-pkg_preinst() { |
| 86 |
- # we only ever want to generate this once |
| 87 |
- if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then |
| 88 |
- rm -rf "${D}"/etc/libvirt/qemu/networks/default.xml || die |
| 89 |
- fi |
| 90 |
-} |
| 91 |
- |
| 92 |
pkg_postinst() { |
| 93 |
if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then |
| 94 |
touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml || die |
Archives