diff options
| author |   Bruce Ashfield <bruce.ashfield@gmail.com> | 2020-09-02 16:11:20 -0400 |
|---|---|---|
| committer |   Steve Sakoman <steve@sakoman.com> | 2020-09-30 04:35:15 -1000 |
| commit | 271ed4e1c3528310518b1729759c92959ac41e8c (patch) | |
| tree | 9e417323cca98e09033eadeb167c1b4fac7c8b87 | |
| parent | 9f0e7c1a17542aa36d4245f15f6ffbafcbaf9bd3 (diff) | |
| download | openembedded-core-contrib-271ed4e1c3528310518b1729759c92959ac41e8c.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
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
(cherry picked from commit 788623ab2913e760da9405de1c3a2633140122eb)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
| -rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_5.4.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_5.4.bb | 2 |
3 files changed, 3 insertions, 3 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 () { } SRCREV_machine ?= "e65e9ff22c5c42c9ae57a4cce45fbf91a7e7ae3b" -SRCREV_meta ?= "7ed307f65171d331a784ceecb6f56b9f8ecadb10" +SRCREV_meta ?= "647f4fd91cc47567a7d88f21a6ad7d230d354469" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ 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-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" SRCREV_machine_qemuarm ?= "f30ce7653a038eb05ef0503d0d15c7c6ec33cdc5" SRCREV_machine ?= "00809fdaf65b24fcd0347f3d3e489e2890f7ed44" -SRCREV_meta ?= "7ed307f65171d331a784ceecb6f56b9f8ecadb10" +SRCREV_meta ?= "647f4fd91cc47567a7d88f21a6ad7d230d354469" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_5.4.bb b/meta/recipes-kernel/linux/linux-yocto_5.4.bb index 070486c8aa..f20aa6c618 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" SRCREV_machine_qemux86-64 ?= "00809fdaf65b24fcd0347f3d3e489e2890f7ed44" SRCREV_machine_qemumips64 ?= "4fe8438e9dea8d0a00f82003277f36785aac9e3d" SRCREV_machine ?= "00809fdaf65b24fcd0347f3d3e489e2890f7ed44" -SRCREV_meta ?= "7ed307f65171d331a784ceecb6f56b9f8ecadb10" +SRCREV_meta ?= "647f4fd91cc47567a7d88f21a6ad7d230d354469" # remap qemuarm to qemuarma15 for the 5.4 kernel # KMACHINE_qemuarm ?= "qemuarma15" |