linux: Enable NAT_NEEDED

Recommended for Docker, can't find any documentation as to why.

10 files changed, 11 insertions, 1 deletions

diff --git a/strata/bsp-armv7-highbank/linux-armv7-highbank.morph b/strata/bsp-armv7-highbank/linux-armv7-highbank.morph
index 8e70d4f5..d64bce37 100644
--- a/strata/bsp-armv7-highbank/linux-armv7-highbank.morph
+++ b/strata/bsp-armv7-highbank/linux-armv7-highbank.morph
@@ -42,6 +42,7 @@ configure-commands:
 - scripts/config -e VETH
 - scripts/config -e MACVLAN
 - scripts/config -e NF_NAT
+- scripts/config -e NF_NAT_NEEDED
 - 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 8740d046..d4ad1486 100644
--- a/strata/bsp-armv7-versatile/linux-armv7-versatile.morph
+++ b/strata/bsp-armv7-versatile/linux-armv7-versatile.morph
@@ -22,6 +22,7 @@ configure-commands:
 - scripts/config -e VETH
 - scripts/config -e MACVLAN
 - scripts/config -e NF_NAT
+- scripts/config -e NF_NAT_NEEDED
 - 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 f057043c..10cbcb01 100644
--- a/strata/bsp-armv7b-highbank/linux-armv7b-highbank.morph
+++ b/strata/bsp-armv7b-highbank/linux-armv7b-highbank.morph
@@ -44,6 +44,7 @@ configure-commands:
 - scripts/config -e VETH
 - scripts/config -e MACVLAN
 - scripts/config -e NF_NAT
+- scripts/config -e NF_NAT_NEEDED
 - 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 67aeff86..a0ca6ef9 100644
--- a/strata/bsp-armv7b-vexpress-tc2/linux-armv7b-vexpress-tc2.morph
+++ b/strata/bsp-armv7b-vexpress-tc2/linux-armv7b-vexpress-tc2.morph
@@ -44,6 +44,7 @@ configure-commands:
 - scripts/config -e VETH
 - scripts/config -e MACVLAN
 - scripts/config -e NF_NAT
+- scripts/config -e NF_NAT_NEEDED
 - 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 055fcf67..0d755376 100644
--- a/strata/bsp-ppc64-generic/linux-ppc64.morph
+++ b/strata/bsp-ppc64-generic/linux-ppc64.morph
@@ -53,6 +53,7 @@ configure-commands:
 - scripts/config -e VETH
 - scripts/config -e MACVLAN
 - scripts/config -e NF_NAT
+- scripts/config -e NF_NAT_NEEDED
 - 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 9c5cf72a..a5d8c0da 100644
--- a/strata/bsp-wandboard/linux-armv7-wandboard.morph
+++ b/strata/bsp-wandboard/linux-armv7-wandboard.morph
@@ -49,6 +49,7 @@ configure-commands:
 - scripts/config -e VETH
 - scripts/config -e MACVLAN
 - scripts/config -e NF_NAT
+- scripts/config -e NF_NAT_NEEDED
 - 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 6d133f7a..3870630a 100644
--- a/strata/bsp-x86_32-generic/linux-x86-32-generic.morph
+++ b/strata/bsp-x86_32-generic/linux-x86-32-generic.morph
@@ -77,6 +77,7 @@ configure-commands:
 - scripts/config -e MACVLAN
 - scripts/config -e NF_NAT
 - scripts/config -e NF_NAT_IPV4
+- scripts/config -e NF_NAT_NEEDED
 - 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 3a182d26..c6bb69fa 100644
--- a/strata/bsp-x86_64-generic/linux-x86-64-generic.morph
+++ b/strata/bsp-x86_64-generic/linux-x86-64-generic.morph
@@ -77,6 +77,7 @@ configure-commands:
 - scripts/config -e MACVLAN
 - scripts/config -e NF_NAT
 - scripts/config -e NF_NAT_IPV4
+- scripts/config -e NF_NAT_NEEDED
 - scripts/config -e IP_NF_TARGET_MASQUERADE
 - scripts/config -e FB_VESA
 - yes '' | make oldconfig
diff --git a/strata/go-docker.morph b/strata/go-docker.morph
index fb4533fb..f358af9c 100644
--- a/strata/go-docker.morph
+++ b/strata/go-docker.morph
@@ -11,7 +11,7 @@ chunks:
 - name: docker
   morph: strata/go-docker/docker.morph
   repo: upstream:docker
-  ref: baserock/ps/add-go-docker
+  ref: baserock/v1.1.2
   build-depends:
   - go
 - name: iptables
diff --git a/systems/devel-system-x86_64-generic.morph b/systems/devel-system-x86_64-generic.morph
index bf5a7f45..e62c518a 100644
--- a/systems/devel-system-x86_64-generic.morph
+++ b/systems/devel-system-x86_64-generic.morph
@@ -18,6 +18,8 @@ strata:
   morph: strata/openstack-clients.morph
 - name: cloudinit-support
   morph: strata/cloudinit-support.morph
+- name: go-docker
+  morph: strata/go-docker.morph
 configuration-extensions:
 - set-hostname
 - add-config-files