From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 904751582EF for ; Fri, 14 Feb 2025 06:01:52 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 78D0934319D for ; Fri, 14 Feb 2025 06:01:52 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id D4CA8110471; Fri, 14 Feb 2025 06:01:48 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id CEBE1110471 for ; Fri, 14 Feb 2025 06:01:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 588B2343086 for ; Fri, 14 Feb 2025 06:01:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B9A5126C6 for ; Fri, 14 Feb 2025 06:01:46 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1739512865.e47fcff8fa2fad5be5d40ee0133cf87b6ce54cca.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/libvirt/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/libvirt/libvirt-9999.ebuild X-VCS-Directories: app-emulation/libvirt/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: e47fcff8fa2fad5be5d40ee0133cf87b6ce54cca X-VCS-Branch: master Date: Fri, 14 Feb 2025 06:01:46 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 962e156d-7d6a-4ed5-8c4c-0e6e4a29846b X-Archives-Hash: 4352401292c5b8e2c452f765e672a024 commit: e47fcff8fa2fad5be5d40ee0133cf87b6ce54cca Author: Michal Privoznik gmail com> AuthorDate: Thu Feb 13 20:09:36 2025 +0000 Commit: Sam James gentoo org> CommitDate: Fri Feb 14 06:01:05 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e47fcff8 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 gmail.com> Closes: https://github.com/gentoo/gentoo/pull/40566 Signed-off-by: Sam James gentoo.org> 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 99531cda8fc4..28c7fc107ed5 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