diff options
author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2021-06-27 12:50:39 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-07-06 13:02:30 +0100 |
commit | e6f4a13a0ccdce9a4314b1dd11ce8522cc24a43e (patch) | |
tree | 1c263bd76d68b4312dd208ab5b80d16aca90ba8a /meta | |
parent | 7109c0fa460d58cd4a3f7fa845ef32e3bccfb310 (diff) | |
download | poky-e6f4a13a0ccdce9a4314b1dd11ce8522cc24a43e.tar.gz |
linux-yocto/5.10: features/nft_tables: refresh config options
The nft tables feature had become out of sync with current config
options. Refreshing the support with the following commits:
Integrating the following commit(s) to linux-yocto/.:
da478fab290 nft: add CONFIG_NFT_SOCKET
54e2d36b291 nft: add CONFIG_NFT_TUNNEL
6fefc38049a nft: add CONFIG_NFT_CONNLIMIT
cb0b5fc7ed5 nft: enable NF_TABLES_NETDEV
d36b304d614 nft: drop rbtree
0a70fa87ee0 nft: merge chain nat types
c226e82038a nft: merge route type to core
79968ab78bb nft: masq options merged
8a0bff8cc5f nft: _set is now built-ins
5952a26c4f7 nft: consolidate _set options
0941f794363 nf: META is now builtin
2fcc2c1b552 nf: EXTHDR is part of core, drop config
e909f08155d nf: ARP is bool, set to y
3bc18ee0615 nf: make nf_tables =y
b90241a5403 nf: set CONFIG_NF_TABLES_IPV6, since dependencies are =y
32ae602ab4d nf: set CONFIG_NF_TABLES_IPV4, since dependencies are =y
2a9be72daea nf: make inet_tables =y
(From OE-Core rev: c3f2e4c0314d56053b235ed4f0455aa49b79ebed)
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit cce1ed5973455666c09dd56ecf3d0c373bdb3fb2)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_5.10.bb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb index 30dbb5d832..ea2c854649 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb | |||
@@ -12,7 +12,7 @@ python () { | |||
12 | } | 12 | } |
13 | 13 | ||
14 | SRCREV_machine ?= "74f60bcd7323d243e0f3d3db34021ae624afb61a" | 14 | SRCREV_machine ?= "74f60bcd7323d243e0f3d3db34021ae624afb61a" |
15 | SRCREV_meta ?= "4a59bc57b2be77da9394b10eb37067da7d63b7a4" | 15 | SRCREV_meta ?= "b969f83647833d21d8826c4667492f58895213c3" |
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.10;destsuffix=${KMETA}" | 18 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.10;destsuffix=${KMETA}" |
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb index 33339f5ca1..d73b1d0305 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb | |||
@@ -17,7 +17,7 @@ KCONF_BSP_AUDIT_LEVEL = "2" | |||
17 | 17 | ||
18 | SRCREV_machine_qemuarm ?= "20eb193a68fbdaa56ed9a49b97aef6a0eb9fbdea" | 18 | SRCREV_machine_qemuarm ?= "20eb193a68fbdaa56ed9a49b97aef6a0eb9fbdea" |
19 | SRCREV_machine ?= "9fe9a613a93f7ff39c94e376a15d5fc3ec7a0640" | 19 | SRCREV_machine ?= "9fe9a613a93f7ff39c94e376a15d5fc3ec7a0640" |
20 | SRCREV_meta ?= "2c3ec293dba693dc7a344d4e42cb7fa733ef4f2d" | 20 | SRCREV_meta ?= "b969f83647833d21d8826c4667492f58895213c3" |
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.10.bb b/meta/recipes-kernel/linux/linux-yocto_5.10.bb index 9d7690dcd1..c3342da193 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.10.bb | |||
@@ -23,7 +23,7 @@ SRCREV_machine_qemux86 ?= "9fe9a613a93f7ff39c94e376a15d5fc3ec7a0640" | |||
23 | SRCREV_machine_qemux86-64 ?= "9fe9a613a93f7ff39c94e376a15d5fc3ec7a0640" | 23 | SRCREV_machine_qemux86-64 ?= "9fe9a613a93f7ff39c94e376a15d5fc3ec7a0640" |
24 | SRCREV_machine_qemumips64 ?= "7bc9a08bf3b92db4fdb0225fdd23836c8f5c037f" | 24 | SRCREV_machine_qemumips64 ?= "7bc9a08bf3b92db4fdb0225fdd23836c8f5c037f" |
25 | SRCREV_machine ?= "9fe9a613a93f7ff39c94e376a15d5fc3ec7a0640" | 25 | SRCREV_machine ?= "9fe9a613a93f7ff39c94e376a15d5fc3ec7a0640" |
26 | SRCREV_meta ?= "2c3ec293dba693dc7a344d4e42cb7fa733ef4f2d" | 26 | SRCREV_meta ?= "b969f83647833d21d8826c4667492f58895213c3" |
27 | 27 | ||
28 | # remap qemuarm to qemuarma15 for the 5.8 kernel | 28 | # remap qemuarm to qemuarma15 for the 5.8 kernel |
29 | # KMACHINE_qemuarm ?= "qemuarma15" | 29 | # KMACHINE_qemuarm ?= "qemuarma15" |