From 068b1b2d268faa963e851696bafde5abc653a2d2 Mon Sep 17 00:00:00 2001 From: Francisco Redondo Marchena Date: Thu, 12 Feb 2015 13:39:46 +0000 Subject: Rename NAT kernel configuration item CONFIG_NF_NAT_IPV4 is known as CONFIG_IP_NF_NAT in 3.17 kernels onwards. Change-Id: I4c41eb01c62de37f0c16aedaec01d404de50a2e1 --- strata/bsp-armv8l64-generic/linux-armv8l64-generic.morph | 2 +- strata/bsp-x86_32-generic/linux-x86-32-generic.morph | 2 +- strata/bsp-x86_64-generic/linux-x86-64-generic.morph | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/strata/bsp-armv8l64-generic/linux-armv8l64-generic.morph b/strata/bsp-armv8l64-generic/linux-armv8l64-generic.morph index a7f9691b..33b6a7bf 100644 --- a/strata/bsp-armv8l64-generic/linux-armv8l64-generic.morph +++ b/strata/bsp-armv8l64-generic/linux-armv8l64-generic.morph @@ -64,7 +64,7 @@ configure-commands: - scripts/config -e BRIDGE - scripts/config -e VHOST_NET - scripts/config -e NF_NAT -- scripts/config -e NF_NAT_IPV4 +- scripts/config -e IP_NF_NAT - scripts/config -e IP_NF_TARGET_MASQUERADE - scripts/config -e FB_VESA - scripts/config -e HOTPLUG_PCI diff --git a/strata/bsp-x86_32-generic/linux-x86-32-generic.morph b/strata/bsp-x86_32-generic/linux-x86-32-generic.morph index 4ff10015..769cad6e 100644 --- a/strata/bsp-x86_32-generic/linux-x86-32-generic.morph +++ b/strata/bsp-x86_32-generic/linux-x86-32-generic.morph @@ -74,7 +74,7 @@ configure-commands: - scripts/config -e BRIDGE - scripts/config -e VHOST_NET - scripts/config -e NF_NAT -- scripts/config -e NF_NAT_IPV4 +- scripts/config -e IP_NF_NAT - scripts/config -e IP_NF_TARGET_MASQUERADE - scripts/config -e FB_VESA - scripts/config -e HOTPLUG_PCI diff --git a/strata/bsp-x86_64-generic/linux-x86-64-generic.morph b/strata/bsp-x86_64-generic/linux-x86-64-generic.morph index 377536c1..cc007133 100644 --- a/strata/bsp-x86_64-generic/linux-x86-64-generic.morph +++ b/strata/bsp-x86_64-generic/linux-x86-64-generic.morph @@ -74,7 +74,7 @@ configure-commands: - scripts/config -e BRIDGE - scripts/config -e VHOST_NET - scripts/config -e NF_NAT -- scripts/config -e NF_NAT_IPV4 +- scripts/config -e IP_NF_NAT - scripts/config -e IP_NF_TARGET_MASQUERADE - scripts/config -e FB_VESA - scripts/config -e HOTPLUG_PCI -- cgit v1.2.1