summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRodrigo Saboya <saboya@gmail.com>2019-07-31 11:35:52 -0300
committerMatt Turner <mattst88@gentoo.org>2019-10-21 12:39:40 -0700
commit6d1d316c6e8715035f12d4bb5ac24065bf1ef851 (patch)
tree91ca91780df1dcd520d9eb360d87ee8536756c24 /net-misc/networkmanager/networkmanager-1.18.4-r1.ebuild
parentnet-misc/networkmanager: Fix udev rule (diff)
downloadgentoo-6d1d316c6e8715035f12d4bb5ac24065bf1ef851.tar.gz
gentoo-6d1d316c6e8715035f12d4bb5ac24065bf1ef851.tar.bz2
gentoo-6d1d316c6e8715035f12d4bb5ac24065bf1ef851.zip
net-misc/networkmanager: Fixing kernel config check
CONFIG_NF_NAT_IPV4 and CONFIG_NF_NAT_IPV6 were merged into CONFIG_NF_NAT on: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=3bf195ae6037e310d693ff3313401cfaf1261b71 CONFIG_NF_NAT_MASQUERADE_IPV4 and CONFIG_NF_NAT_MASQUERADE_IPV6 were merged into CONFIG_NF_NAT_MASQUERADE on: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=d1aca8ab3104aa7131f5ab144c6f586b54df084b Closes: https://bugs.gentoo.org/691140 Closes: https://github.com/gentoo/gentoo/pull/12559 Signed-off-by: Rodrigo Saboya <saboya@gmail.com> Signed-off-by: Matt Turner <mattst88@gentoo.org>
Diffstat (limited to 'net-misc/networkmanager/networkmanager-1.18.4-r1.ebuild')
-rw-r--r--net-misc/networkmanager/networkmanager-1.18.4-r1.ebuild6
1 files changed, 5 insertions, 1 deletions
diff --git a/net-misc/networkmanager/networkmanager-1.18.4-r1.ebuild b/net-misc/networkmanager/networkmanager-1.18.4-r1.ebuild
index 6698561d3d6b..349e1bbb84c9 100644
--- a/net-misc/networkmanager/networkmanager-1.18.4-r1.ebuild
+++ b/net-misc/networkmanager/networkmanager-1.18.4-r1.ebuild
@@ -143,7 +143,11 @@ pkg_pretend() {
pkg_setup() {
if use connection-sharing; then
- CONFIG_CHECK="~NF_NAT ~NF_NAT_MASQUERADE"
+ if kernel_is lt 5 1; then
+ CONFIG_CHECK="~NF_NAT_IPV4 ~NF_NAT_MASQUERADE_IPV4"
+ else
+ CONFIG_CHECK="~NF_NAT ~NF_NAT_MASQUERADE"
+ fi
linux-info_pkg_setup
fi
if use introspection || use test; then