From e47fcff8fa2fad5be5d40ee0133cf87b6ce54cca Mon Sep 17 00:00:00 2001 From: Michal Privoznik Date: Thu, 13 Feb 2025 21:09:36 +0100 Subject: [PATCH] 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 Closes: https://github.com/gentoo/gentoo/pull/40566 Signed-off-by: Sam James --- app-emulation/libvirt/libvirt-9999.ebuild | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild index 99531cda8fc49..28c7fc107ed5a 100644 --- a/app-emulation/libvirt/libvirt-9999.ebuild +++ b/app-emulation/libvirt/libvirt-9999.ebuild @@ -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