mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-08-06 12:58:16 -07:00
app-emulation/libvirt: Drop workarounds for CONFIG_CHECK for old kernels
Some kernel config options are renamed and to allow users to run libvirt on older kernels we had to check kernel version and either include old or new name in CONFIG_CHECK. Well, I think it is safe to assume nobody runs the most recent libvirt on 4.X or <5.2 kernels and thus these workarounds can be dropped. Just to be on the safe side, let's make the change only for the live ebuild for now. Signed-off-by: Michal Privoznik <michal.privoznik@gmail.com> Closes: https://github.com/gentoo/gentoo/pull/40566 Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
committed by
Sam James
parent
b51436d29c
commit
e47fcff8fa
@@ -205,9 +205,6 @@ pkg_setup() {
|
||||
~!GRKERNSEC_CHROOT_CHMOD
|
||||
~!GRKERNSEC_CHROOT_CAPS"
|
||||
|
||||
kernel_is lt 4 7 && use lxc && CONFIG_CHECK+="
|
||||
~DEVPTS_MULTIPLE_INSTANCES"
|
||||
|
||||
use virt-network && CONFIG_CHECK+="
|
||||
~BRIDGE_EBT_MARK_T
|
||||
~BRIDGE_NF_EBTABLES
|
||||
@@ -215,6 +212,7 @@ pkg_setup() {
|
||||
~NETFILTER_XT_CONNMARK
|
||||
~NETFILTER_XT_MARK
|
||||
~NETFILTER_XT_TARGET_CHECKSUM
|
||||
~NETFILTER_XT_TARGET_MASQUERADE
|
||||
~NET_ACT_CSUM
|
||||
~IP_NF_FILTER
|
||||
~IP_NF_MANGLE
|
||||
@@ -223,17 +221,6 @@ pkg_setup() {
|
||||
~IP6_NF_MANGLE
|
||||
~IP6_NF_NAT"
|
||||
|
||||
# This was renamed in kernel commit v5.2-rc1~133^2~174^2~6
|
||||
if use virt-network ; then
|
||||
if kernel_is -lt 5 2 ; then
|
||||
CONFIG_CHECK+="
|
||||
~IP_NF_TARGET_MASQUERADE"
|
||||
else
|
||||
CONFIG_CHECK+="
|
||||
~NETFILTER_XT_TARGET_MASQUERADE"
|
||||
fi
|
||||
fi
|
||||
|
||||
# Bandwidth Limiting Support
|
||||
use virt-network && CONFIG_CHECK+="
|
||||
~BRIDGE_EBT_T_NAT
|
||||
|
||||
Reference in New Issue
Block a user