From f7a8a354e2a5acf0a1544faae97c45ae7967a28e Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Fri, 5 Sep 2014 10:59:00 +0000 Subject: linux: Enable advanced netfilter matches required for Docker --- strata/bsp-armv7-highbank/linux-armv7-highbank.morph | 2 ++ strata/bsp-armv7-versatile/linux-armv7-versatile.morph | 2 ++ strata/bsp-armv7b-highbank/linux-armv7b-highbank.morph | 2 ++ strata/bsp-armv7b-vexpress-tc2/linux-armv7b-vexpress-tc2.morph | 2 ++ strata/bsp-ppc64-generic/linux-ppc64.morph | 2 ++ strata/bsp-wandboard/linux-armv7-wandboard.morph | 2 ++ strata/bsp-x86_32-generic/linux-x86-32-generic.morph | 2 ++ strata/bsp-x86_64-generic/linux-x86-64-generic.morph | 2 ++ 8 files changed, 16 insertions(+) diff --git a/strata/bsp-armv7-highbank/linux-armv7-highbank.morph b/strata/bsp-armv7-highbank/linux-armv7-highbank.morph index cf356473..400dae42 100644 --- a/strata/bsp-armv7-highbank/linux-armv7-highbank.morph +++ b/strata/bsp-armv7-highbank/linux-armv7-highbank.morph @@ -44,6 +44,8 @@ configure-commands: - scripts/config -e MACVLAN - scripts/config -e NF_NAT - scripts/config -e NF_NAT_NEEDED +- scripts/config -e NETFILTER_XT_MATCH_ADDRTYPE +- scripts/config -e NETFILTER_XT_MATCH_CONNTRACK - yes '' | make oldconfig build-commands: - make zImage $MAKEFLAGS diff --git a/strata/bsp-armv7-versatile/linux-armv7-versatile.morph b/strata/bsp-armv7-versatile/linux-armv7-versatile.morph index cbacfc46..76429c0e 100644 --- a/strata/bsp-armv7-versatile/linux-armv7-versatile.morph +++ b/strata/bsp-armv7-versatile/linux-armv7-versatile.morph @@ -24,6 +24,8 @@ configure-commands: - scripts/config -e MACVLAN - scripts/config -e NF_NAT - scripts/config -e NF_NAT_NEEDED +- scripts/config -e NETFILTER_XT_MATCH_ADDRTYPE +- scripts/config -e NETFILTER_XT_MATCH_CONNTRACK - yes '' | make oldconfig build-commands: - make ARCH=arm zImage $MAKEFLAGS diff --git a/strata/bsp-armv7b-highbank/linux-armv7b-highbank.morph b/strata/bsp-armv7b-highbank/linux-armv7b-highbank.morph index e3011233..3c125531 100644 --- a/strata/bsp-armv7b-highbank/linux-armv7b-highbank.morph +++ b/strata/bsp-armv7b-highbank/linux-armv7b-highbank.morph @@ -46,6 +46,8 @@ configure-commands: - scripts/config -e MACVLAN - scripts/config -e NF_NAT - scripts/config -e NF_NAT_NEEDED +- scripts/config -e NETFILTER_XT_MATCH_ADDRTYPE +- scripts/config -e NETFILTER_XT_MATCH_CONNTRACK - yes '' | make oldconfig build-commands: - make zImage $MAKEFLAGS diff --git a/strata/bsp-armv7b-vexpress-tc2/linux-armv7b-vexpress-tc2.morph b/strata/bsp-armv7b-vexpress-tc2/linux-armv7b-vexpress-tc2.morph index 290b7c28..44752d84 100644 --- a/strata/bsp-armv7b-vexpress-tc2/linux-armv7b-vexpress-tc2.morph +++ b/strata/bsp-armv7b-vexpress-tc2/linux-armv7b-vexpress-tc2.morph @@ -46,6 +46,8 @@ configure-commands: - scripts/config -e MACVLAN - scripts/config -e NF_NAT - scripts/config -e NF_NAT_NEEDED +- scripts/config -e NETFILTER_XT_MATCH_ADDRTYPE +- scripts/config -e NETFILTER_XT_MATCH_CONNTRACK - yes '' | make oldconfig build-commands: - make zImage vexpress-v2p-ca15_a7.dtb diff --git a/strata/bsp-ppc64-generic/linux-ppc64.morph b/strata/bsp-ppc64-generic/linux-ppc64.morph index b2a0acf8..3c5068e1 100644 --- a/strata/bsp-ppc64-generic/linux-ppc64.morph +++ b/strata/bsp-ppc64-generic/linux-ppc64.morph @@ -55,6 +55,8 @@ configure-commands: - scripts/config -e MACVLAN - scripts/config -e NF_NAT - scripts/config -e NF_NAT_NEEDED +- scripts/config -e NETFILTER_XT_MATCH_ADDRTYPE +- scripts/config -e NETFILTER_XT_MATCH_CONNTRACK - yes '' | make oldconfig build-commands: - make $MAKEFLAGS ARCH=powerpc zImage diff --git a/strata/bsp-wandboard/linux-armv7-wandboard.morph b/strata/bsp-wandboard/linux-armv7-wandboard.morph index d937e3dc..effd8ee8 100644 --- a/strata/bsp-wandboard/linux-armv7-wandboard.morph +++ b/strata/bsp-wandboard/linux-armv7-wandboard.morph @@ -51,6 +51,8 @@ configure-commands: - scripts/config -e MACVLAN - scripts/config -e NF_NAT - scripts/config -e NF_NAT_NEEDED +- scripts/config -e NETFILTER_XT_MATCH_ADDRTYPE +- scripts/config -e NETFILTER_XT_MATCH_CONNTRACK - yes '' | make oldconfig build-commands: - make $MAKEFLAGS ARCH=arm LOADADDR=0x10800000 uImage dtbs 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 8b6a4ae7..455a2463 100644 --- a/strata/bsp-x86_32-generic/linux-x86-32-generic.morph +++ b/strata/bsp-x86_32-generic/linux-x86-32-generic.morph @@ -79,6 +79,8 @@ configure-commands: - scripts/config -e NF_NAT - scripts/config -e NF_NAT_IPV4 - scripts/config -e NF_NAT_NEEDED +- scripts/config -e NETFILTER_XT_MATCH_ADDRTYPE +- scripts/config -e NETFILTER_XT_MATCH_CONNTRACK - scripts/config -e IP_NF_TARGET_MASQUERADE - scripts/config -e FB_VESA - yes '' | make oldconfig 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 ce4a8cfc..2b44e51c 100644 --- a/strata/bsp-x86_64-generic/linux-x86-64-generic.morph +++ b/strata/bsp-x86_64-generic/linux-x86-64-generic.morph @@ -79,6 +79,8 @@ configure-commands: - scripts/config -e NF_NAT - scripts/config -e NF_NAT_IPV4 - scripts/config -e NF_NAT_NEEDED +- scripts/config -e NETFILTER_XT_MATCH_ADDRTYPE +- scripts/config -e NETFILTER_XT_MATCH_CONNTRACK - scripts/config -e IP_NF_TARGET_MASQUERADE - scripts/config -e FB_VESA - yes '' | make oldconfig -- cgit v1.2.1