diff options
author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2023-03-01 10:13:39 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-03-03 18:03:56 +0000 |
commit | 61e80223a9d7e7aa5046f673eccbb182374560a7 (patch) | |
tree | 1097ef7abd2504542a671f4d0bbd07ebfde92d8b /meta/recipes-kernel | |
parent | 778e1b56ad2764b1d9b6fde1897fa2bc7bafdb0a (diff) | |
download | poky-61e80223a9d7e7aa5046f673eccbb182374560a7.tar.gz |
linux-yocto-rt/6.1: fix compilation issue with per cpu stats
Integrating the following commit(s) to linux-yocto/6.1:
3b4c5ff8e4f1 net: fix net/netfilter/ipvs/ip_vs_ctl.c with u64 and u64_stats_t
(From OE-Core rev: 7d7044e8031009ecebd8586ce52d1c1207546668)
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel')
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb | 4 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_6.1.bb | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb b/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb index 28b7159359..7a7537505e 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb | |||
@@ -11,8 +11,8 @@ python () { | |||
11 | raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") | 11 | raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") |
12 | } | 12 | } |
13 | 13 | ||
14 | SRCREV_machine ?= "94f73e8d6872df48a7c4ee6caa1701ae2a535dfe" | 14 | SRCREV_machine ?= "8183fc0efdb87bd314afda93a7c02ff85dc5833d" |
15 | SRCREV_meta ?= "d7393c5752865634e307673043da55e353139333" | 15 | SRCREV_meta ?= "a833bd2ced5dcd01c043348ec47218a545d00c5f" |
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-6.1;destsuffix=${KMETA}" | 18 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.1;destsuffix=${KMETA}" |
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb index 65866dd1db..393952a980 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb | |||
@@ -15,7 +15,7 @@ KMETA = "kernel-meta" | |||
15 | KCONF_BSP_AUDIT_LEVEL = "2" | 15 | KCONF_BSP_AUDIT_LEVEL = "2" |
16 | 16 | ||
17 | SRCREV_machine ?= "1caf99d56881e1510afca553cd4a057f80479973" | 17 | SRCREV_machine ?= "1caf99d56881e1510afca553cd4a057f80479973" |
18 | SRCREV_meta ?= "d7393c5752865634e307673043da55e353139333" | 18 | SRCREV_meta ?= "a833bd2ced5dcd01c043348ec47218a545d00c5f" |
19 | 19 | ||
20 | PV = "${LINUX_VERSION}+git${SRCPV}" | 20 | PV = "${LINUX_VERSION}+git${SRCPV}" |
21 | 21 | ||
diff --git a/meta/recipes-kernel/linux/linux-yocto_6.1.bb b/meta/recipes-kernel/linux/linux-yocto_6.1.bb index 66d397837f..8c99b98933 100644 --- a/meta/recipes-kernel/linux/linux-yocto_6.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto_6.1.bb | |||
@@ -25,7 +25,7 @@ SRCREV_machine:qemux86 ?= "1caf99d56881e1510afca553cd4a057f80479973" | |||
25 | SRCREV_machine:qemux86-64 ?= "1caf99d56881e1510afca553cd4a057f80479973" | 25 | SRCREV_machine:qemux86-64 ?= "1caf99d56881e1510afca553cd4a057f80479973" |
26 | SRCREV_machine:qemumips64 ?= "2949d76c3f79f3c7f700a6366d828f006d7dd5a8" | 26 | SRCREV_machine:qemumips64 ?= "2949d76c3f79f3c7f700a6366d828f006d7dd5a8" |
27 | SRCREV_machine ?= "1caf99d56881e1510afca553cd4a057f80479973" | 27 | SRCREV_machine ?= "1caf99d56881e1510afca553cd4a057f80479973" |
28 | SRCREV_meta ?= "d7393c5752865634e307673043da55e353139333" | 28 | SRCREV_meta ?= "a833bd2ced5dcd01c043348ec47218a545d00c5f" |
29 | 29 | ||
30 | # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll | 30 | # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll |
31 | # get the <version>/base branch, which is pure upstream -stable, and the same | 31 | # get the <version>/base branch, which is pure upstream -stable, and the same |