summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2016-12-29 22:38:07 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-01-23 12:05:23 +0000
commit12da4527ea86cad17674a517e243cd4af7a52be7 (patch)
tree87f69f85000a0c24cab9379e4cb6266053c728b6
parent5191d13abe37ff63a50ceb1190b498332c1c7374 (diff)
downloadpoky-12da4527ea86cad17674a517e243cd4af7a52be7.tar.gz
linux-yocto/4.4/4.8/4.9: netfilter: iptables: enable NAT tables
This changes adds 'nat' table in iptables. The netfilter side is already configured for NAT but iptables config was missing. Further, CONFIG_IP_NF_TARGET* configured below depend on CONFIG_IP_NF_NAT but remain disabled unless CONFIG_IP_NF_NAT is explicitly enabled. CONFIG_IP_NF_TARGET_MASQUERADE is needed by Connman to support tethering. (From OE-Core rev: 0a382b58c01bb359b225f48f312f696f0badf27b) Signed-off-by: Mikko Ylinen <mikko.ylinen@linux.intel.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-rt_4.8.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-tiny_4.8.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-tiny_4.9.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_4.4.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_4.8.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_4.9.bb2
9 files changed, 9 insertions, 9 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb
index 20ea0dc9b2..53a9b5736d 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb
@@ -12,7 +12,7 @@ python () {
12} 12}
13 13
14SRCREV_machine ?= "61d7bf47fe27b7dfd9a73b0a6de2d78a29af8b74" 14SRCREV_machine ?= "61d7bf47fe27b7dfd9a73b0a6de2d78a29af8b74"
15SRCREV_meta ?= "7da5624a915368bb93814379e7e1c3bbefae4cae" 15SRCREV_meta ?= "4c31a115453dad875dda85786c4c34572d6c64a2"
16 16
17SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.4.git;branch=${KBRANCH};name=machine \ 17SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.4.git;branch=${KBRANCH};name=machine \
18 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.4;destsuffix=${KMETA}" 18 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.4;destsuffix=${KMETA}"
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.8.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.8.bb
index ce83410d0a..5991f2b165 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_4.8.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.8.bb
@@ -12,7 +12,7 @@ python () {
12} 12}
13 13
14SRCREV_machine ?= "3bafd55e39da7fd7c5d483fdee5b72450df3caf0" 14SRCREV_machine ?= "3bafd55e39da7fd7c5d483fdee5b72450df3caf0"
15SRCREV_meta ?= "9ca50a7edc6bba11f0f9ce1eec3e6004f3043820" 15SRCREV_meta ?= "0da38d7c70b06ba69dcc6fa305ecf4edc2669598"
16 16
17SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.8.git;branch=${KBRANCH};name=machine \ 17SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.8.git;branch=${KBRANCH};name=machine \
18 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.8;destsuffix=${KMETA}" 18 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.8;destsuffix=${KMETA}"
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb
index e41c874870..1dd3b38362 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb
@@ -12,7 +12,7 @@ python () {
12} 12}
13 13
14SRCREV_machine ?= "1eb33152d655c73193cec17c4de04499e52b2faa" 14SRCREV_machine ?= "1eb33152d655c73193cec17c4de04499e52b2faa"
15SRCREV_meta ?= "68e8915786f48996e699272ba33626a44978a14e" 15SRCREV_meta ?= "0cf14593694d33518aabd4846d50adeeb7f559ed"
16 16
17SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.9.git;branch=${KBRANCH};name=machine \ 17SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.9.git;branch=${KBRANCH};name=machine \
18 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.9;destsuffix=${KMETA}" 18 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.9;destsuffix=${KMETA}"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb
index 4fc499c9d8..36e88e3478 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb
@@ -10,7 +10,7 @@ KMETA = "kernel-meta"
10KCONF_BSP_AUDIT_LEVEL = "2" 10KCONF_BSP_AUDIT_LEVEL = "2"
11 11
12SRCREV_machine ?= "35482df5d5ba0807eb8a7c40b554bd657e3f9987" 12SRCREV_machine ?= "35482df5d5ba0807eb8a7c40b554bd657e3f9987"
13SRCREV_meta ?= "7da5624a915368bb93814379e7e1c3bbefae4cae" 13SRCREV_meta ?= "4c31a115453dad875dda85786c4c34572d6c64a2"
14 14
15PV = "${LINUX_VERSION}+git${SRCPV}" 15PV = "${LINUX_VERSION}+git${SRCPV}"
16 16
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.8.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.8.bb
index 721e5c4c20..d2f6c7e71a 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.8.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.8.bb
@@ -10,7 +10,7 @@ KMETA = "kernel-meta"
10KCONF_BSP_AUDIT_LEVEL = "2" 10KCONF_BSP_AUDIT_LEVEL = "2"
11 11
12SRCREV_machine ?= "e274a507b23c23bf0dd6502d0c38fae731c11511" 12SRCREV_machine ?= "e274a507b23c23bf0dd6502d0c38fae731c11511"
13SRCREV_meta ?= "9ca50a7edc6bba11f0f9ce1eec3e6004f3043820" 13SRCREV_meta ?= "0da38d7c70b06ba69dcc6fa305ecf4edc2669598"
14 14
15PV = "${LINUX_VERSION}+git${SRCPV}" 15PV = "${LINUX_VERSION}+git${SRCPV}"
16 16
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.9.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.9.bb
index 613db11641..f4b03a72cb 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.9.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.9.bb
@@ -10,7 +10,7 @@ KMETA = "kernel-meta"
10KCONF_BSP_AUDIT_LEVEL = "2" 10KCONF_BSP_AUDIT_LEVEL = "2"
11 11
12SRCREV_machine ?= "617635e43afee1aaf98a8f8300596f7a112513c0" 12SRCREV_machine ?= "617635e43afee1aaf98a8f8300596f7a112513c0"
13SRCREV_meta ?= "68e8915786f48996e699272ba33626a44978a14e" 13SRCREV_meta ?= "0cf14593694d33518aabd4846d50adeeb7f559ed"
14 14
15PV = "${LINUX_VERSION}+git${SRCPV}" 15PV = "${LINUX_VERSION}+git${SRCPV}"
16 16
diff --git a/meta/recipes-kernel/linux/linux-yocto_4.4.bb b/meta/recipes-kernel/linux/linux-yocto_4.4.bb
index 77b1b80912..8142a361f4 100644
--- a/meta/recipes-kernel/linux/linux-yocto_4.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_4.4.bb
@@ -19,7 +19,7 @@ SRCREV_machine_qemux86 ?= "35482df5d5ba0807eb8a7c40b554bd657e3f9987"
19SRCREV_machine_qemux86-64 ?= "35482df5d5ba0807eb8a7c40b554bd657e3f9987" 19SRCREV_machine_qemux86-64 ?= "35482df5d5ba0807eb8a7c40b554bd657e3f9987"
20SRCREV_machine_qemumips64 ?= "5d05923ecc402c127b92543ee44b890de5c53a7e" 20SRCREV_machine_qemumips64 ?= "5d05923ecc402c127b92543ee44b890de5c53a7e"
21SRCREV_machine ?= "35482df5d5ba0807eb8a7c40b554bd657e3f9987" 21SRCREV_machine ?= "35482df5d5ba0807eb8a7c40b554bd657e3f9987"
22SRCREV_meta ?= "7da5624a915368bb93814379e7e1c3bbefae4cae" 22SRCREV_meta ?= "4c31a115453dad875dda85786c4c34572d6c64a2"
23 23
24SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.4.git;name=machine;branch=${KBRANCH}; \ 24SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.4.git;name=machine;branch=${KBRANCH}; \
25 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.4;destsuffix=${KMETA}" 25 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.4;destsuffix=${KMETA}"
diff --git a/meta/recipes-kernel/linux/linux-yocto_4.8.bb b/meta/recipes-kernel/linux/linux-yocto_4.8.bb
index fbe0ba8ca3..c5feac6b2d 100644
--- a/meta/recipes-kernel/linux/linux-yocto_4.8.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_4.8.bb
@@ -19,7 +19,7 @@ SRCREV_machine_qemux86 ?= "021b4aef55b44597587a1ce5879be642b3dca155"
19SRCREV_machine_qemux86-64 ?= "021b4aef55b44597587a1ce5879be642b3dca155" 19SRCREV_machine_qemux86-64 ?= "021b4aef55b44597587a1ce5879be642b3dca155"
20SRCREV_machine_qemumips64 ?= "1b20066b88c3abdde1f6c449b6562a516b4cce6d" 20SRCREV_machine_qemumips64 ?= "1b20066b88c3abdde1f6c449b6562a516b4cce6d"
21SRCREV_machine ?= "021b4aef55b44597587a1ce5879be642b3dca155" 21SRCREV_machine ?= "021b4aef55b44597587a1ce5879be642b3dca155"
22SRCREV_meta ?= "9ca50a7edc6bba11f0f9ce1eec3e6004f3043820" 22SRCREV_meta ?= "0da38d7c70b06ba69dcc6fa305ecf4edc2669598"
23 23
24SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.8.git;name=machine;branch=${KBRANCH}; \ 24SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.8.git;name=machine;branch=${KBRANCH}; \
25 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.8;destsuffix=${KMETA}" 25 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.8;destsuffix=${KMETA}"
diff --git a/meta/recipes-kernel/linux/linux-yocto_4.9.bb b/meta/recipes-kernel/linux/linux-yocto_4.9.bb
index b623c8b3fc..256d3dbea0 100644
--- a/meta/recipes-kernel/linux/linux-yocto_4.9.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_4.9.bb
@@ -19,7 +19,7 @@ SRCREV_machine_qemux86 ?= "617635e43afee1aaf98a8f8300596f7a112513c0"
19SRCREV_machine_qemux86-64 ?= "617635e43afee1aaf98a8f8300596f7a112513c0" 19SRCREV_machine_qemux86-64 ?= "617635e43afee1aaf98a8f8300596f7a112513c0"
20SRCREV_machine_qemumips64 ?= "3183d61d4d00d8b7faf10d11b3da8cf3db432e6f" 20SRCREV_machine_qemumips64 ?= "3183d61d4d00d8b7faf10d11b3da8cf3db432e6f"
21SRCREV_machine ?= "617635e43afee1aaf98a8f8300596f7a112513c0" 21SRCREV_machine ?= "617635e43afee1aaf98a8f8300596f7a112513c0"
22SRCREV_meta ?= "68e8915786f48996e699272ba33626a44978a14e" 22SRCREV_meta ?= "0cf14593694d33518aabd4846d50adeeb7f559ed"
23 23
24SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.9.git;name=machine;branch=${KBRANCH}; \ 24SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.9.git;name=machine;branch=${KBRANCH}; \
25 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.9;destsuffix=${KMETA}" 25 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.9;destsuffix=${KMETA}"