summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2014-09-05 10:51:05 (GMT)
committerSam Thursfield <sam.thursfield@codethink.co.uk>2014-09-05 10:51:05 (GMT)
commit70169b5a257c87d21d745d4a4e4bf14ebc0a07c4 (patch)
tree845157df7114d2d5093765de78a6da110acf0177
parent27f714a6fc5a6225e001b1eaa2c9aa856a7b2b52 (diff)
downloaddefinitions-70169b5a257c87d21d745d4a4e4bf14ebc0a07c4.tar.gz
linux: Enable NAT_NEEDED
Recommended for Docker, can't find any documentation as to why.
-rw-r--r--strata/bsp-armv7-highbank/linux-armv7-highbank.morph1
-rw-r--r--strata/bsp-armv7-versatile/linux-armv7-versatile.morph1
-rw-r--r--strata/bsp-armv7b-highbank/linux-armv7b-highbank.morph1
-rw-r--r--strata/bsp-armv7b-vexpress-tc2/linux-armv7b-vexpress-tc2.morph1
-rw-r--r--strata/bsp-ppc64-generic/linux-ppc64.morph1
-rw-r--r--strata/bsp-wandboard/linux-armv7-wandboard.morph1
-rw-r--r--strata/bsp-x86_32-generic/linux-x86-32-generic.morph1
-rw-r--r--strata/bsp-x86_64-generic/linux-x86-64-generic.morph1
-rw-r--r--strata/go-docker.morph2
-rw-r--r--systems/devel-system-x86_64-generic.morph2
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 8e70d4f..d64bce3 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 8740d04..d4ad148 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 f057043..10cbcb0 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 67aeff8..a0ca6ef 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 055fcf6..0d75537 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 9c5cf72..a5d8c0d 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 6d133f7..3870630 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 3a182d2..c6bb69f 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 fb4533f..f358af9 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 bf5a7f4..e62c518 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