diff options
author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2020-09-02 16:11:20 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-09-15 11:53:28 +0100 |
commit | 46e74e1253ab9e1a81c1da89e0647471eaf23995 (patch) | |
tree | 9a5ed402a3b145de3894bc8baf7f498391d07c26 | |
parent | 85574ce0cf84eaf828334dd2fafadc18909e73b5 (diff) | |
download | poky-46e74e1253ab9e1a81c1da89e0647471eaf23995.tar.gz |
linux-yocto/config: netfilter: Enable nat for ipv4 and ipv6
Integrating the following commit(s):
80452c7c245 netfilter: Enable nat for ipv4 and ipv6
(From OE-Core rev: 788623ab2913e760da9405de1c3a2633140122eb)
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_5.8.bb | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_5.8.bb | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_5.4.bb | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_5.8.bb | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb index a0324f0304..12c3daab0f 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb | |||
@@ -12,7 +12,7 @@ python () { | |||
12 | } | 12 | } |
13 | 13 | ||
14 | SRCREV_machine ?= "e65e9ff22c5c42c9ae57a4cce45fbf91a7e7ae3b" | 14 | SRCREV_machine ?= "e65e9ff22c5c42c9ae57a4cce45fbf91a7e7ae3b" |
15 | SRCREV_meta ?= "7ed307f65171d331a784ceecb6f56b9f8ecadb10" | 15 | SRCREV_meta ?= "647f4fd91cc47567a7d88f21a6ad7d230d354469" |
16 | 16 | ||
17 | SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ | 17 | SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ |
18 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA}" | 18 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA}" |
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.8.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.8.bb index a87cad962e..8b9dc70aba 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.8.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.8.bb | |||
@@ -12,7 +12,7 @@ python () { | |||
12 | } | 12 | } |
13 | 13 | ||
14 | SRCREV_machine ?= "ded3e9afb3262feb367227c63da1f762f893b192" | 14 | SRCREV_machine ?= "ded3e9afb3262feb367227c63da1f762f893b192" |
15 | SRCREV_meta ?= "0a4bef3856894e8bca3c74c97e7924ad262c0dc8" | 15 | SRCREV_meta ?= "80452c7c245ed02e8dda4b1c519aa270b5e73256" |
16 | 16 | ||
17 | SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ | 17 | SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ |
18 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.8;destsuffix=${KMETA}" | 18 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.8;destsuffix=${KMETA}" |
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb index f835a45870..bc3a1e50e0 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb | |||
@@ -17,7 +17,7 @@ KCONF_BSP_AUDIT_LEVEL = "2" | |||
17 | 17 | ||
18 | SRCREV_machine_qemuarm ?= "f30ce7653a038eb05ef0503d0d15c7c6ec33cdc5" | 18 | SRCREV_machine_qemuarm ?= "f30ce7653a038eb05ef0503d0d15c7c6ec33cdc5" |
19 | SRCREV_machine ?= "00809fdaf65b24fcd0347f3d3e489e2890f7ed44" | 19 | SRCREV_machine ?= "00809fdaf65b24fcd0347f3d3e489e2890f7ed44" |
20 | SRCREV_meta ?= "7ed307f65171d331a784ceecb6f56b9f8ecadb10" | 20 | SRCREV_meta ?= "647f4fd91cc47567a7d88f21a6ad7d230d354469" |
21 | 21 | ||
22 | PV = "${LINUX_VERSION}+git${SRCPV}" | 22 | PV = "${LINUX_VERSION}+git${SRCPV}" |
23 | 23 | ||
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.8.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.8.bb index 3661072a48..d0da4edb61 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.8.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.8.bb | |||
@@ -17,7 +17,7 @@ KCONF_BSP_AUDIT_LEVEL = "2" | |||
17 | 17 | ||
18 | SRCREV_machine_qemuarm ?= "5bc60299c57b6dd6d88cd3196e1a3949a4365214" | 18 | SRCREV_machine_qemuarm ?= "5bc60299c57b6dd6d88cd3196e1a3949a4365214" |
19 | SRCREV_machine ?= "ded3e9afb3262feb367227c63da1f762f893b192" | 19 | SRCREV_machine ?= "ded3e9afb3262feb367227c63da1f762f893b192" |
20 | SRCREV_meta ?= "0a4bef3856894e8bca3c74c97e7924ad262c0dc8" | 20 | SRCREV_meta ?= "80452c7c245ed02e8dda4b1c519aa270b5e73256" |
21 | 21 | ||
22 | PV = "${LINUX_VERSION}+git${SRCPV}" | 22 | PV = "${LINUX_VERSION}+git${SRCPV}" |
23 | 23 | ||
diff --git a/meta/recipes-kernel/linux/linux-yocto_5.4.bb b/meta/recipes-kernel/linux/linux-yocto_5.4.bb index 6b22d138bd..def26f6a92 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.4.bb | |||
@@ -21,7 +21,7 @@ SRCREV_machine_qemux86 ?= "00809fdaf65b24fcd0347f3d3e489e2890f7ed44" | |||
21 | SRCREV_machine_qemux86-64 ?= "00809fdaf65b24fcd0347f3d3e489e2890f7ed44" | 21 | SRCREV_machine_qemux86-64 ?= "00809fdaf65b24fcd0347f3d3e489e2890f7ed44" |
22 | SRCREV_machine_qemumips64 ?= "4fe8438e9dea8d0a00f82003277f36785aac9e3d" | 22 | SRCREV_machine_qemumips64 ?= "4fe8438e9dea8d0a00f82003277f36785aac9e3d" |
23 | SRCREV_machine ?= "00809fdaf65b24fcd0347f3d3e489e2890f7ed44" | 23 | SRCREV_machine ?= "00809fdaf65b24fcd0347f3d3e489e2890f7ed44" |
24 | SRCREV_meta ?= "7ed307f65171d331a784ceecb6f56b9f8ecadb10" | 24 | SRCREV_meta ?= "647f4fd91cc47567a7d88f21a6ad7d230d354469" |
25 | 25 | ||
26 | # remap qemuarm to qemuarma15 for the 5.4 kernel | 26 | # remap qemuarm to qemuarma15 for the 5.4 kernel |
27 | # KMACHINE_qemuarm ?= "qemuarma15" | 27 | # KMACHINE_qemuarm ?= "qemuarma15" |
diff --git a/meta/recipes-kernel/linux/linux-yocto_5.8.bb b/meta/recipes-kernel/linux/linux-yocto_5.8.bb index 91a4873fc9..cd34504946 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.8.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.8.bb | |||
@@ -21,7 +21,7 @@ SRCREV_machine_qemux86 ?= "ded3e9afb3262feb367227c63da1f762f893b192" | |||
21 | SRCREV_machine_qemux86-64 ?= "ded3e9afb3262feb367227c63da1f762f893b192" | 21 | SRCREV_machine_qemux86-64 ?= "ded3e9afb3262feb367227c63da1f762f893b192" |
22 | SRCREV_machine_qemumips64 ?= "c0568a8edccef3a9bb29c2c4911b8200892c23f2" | 22 | SRCREV_machine_qemumips64 ?= "c0568a8edccef3a9bb29c2c4911b8200892c23f2" |
23 | SRCREV_machine ?= "ded3e9afb3262feb367227c63da1f762f893b192" | 23 | SRCREV_machine ?= "ded3e9afb3262feb367227c63da1f762f893b192" |
24 | SRCREV_meta ?= "0a4bef3856894e8bca3c74c97e7924ad262c0dc8" | 24 | SRCREV_meta ?= "80452c7c245ed02e8dda4b1c519aa270b5e73256" |
25 | 25 | ||
26 | # remap qemuarm to qemuarma15 for the 5.8 kernel | 26 | # remap qemuarm to qemuarma15 for the 5.8 kernel |
27 | # KMACHINE_qemuarm ?= "qemuarma15" | 27 | # KMACHINE_qemuarm ?= "qemuarma15" |