diff options
author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2023-01-08 19:38:51 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-01-26 23:37:05 +0000 |
commit | 35ade176ff1363dd5ccb76e8fdcf62127af153f3 (patch) | |
tree | d440bffd18e788366ebbae6bd7aa8e9b9d22c86b | |
parent | 533b22a811cbdb887a361984c71f02661a42d2cf (diff) | |
download | poky-35ade176ff1363dd5ccb76e8fdcf62127af153f3.tar.gz |
linux-yocto/5.15: ltp and squashfs fixes
Integrating the following commit(s) to linux-yocto/5.15:
1c5699ee85d4 fs: move S_ISGID stripping into the vfs_*() helpers
838f5d0701d8 fs: add mode_strip_sgid() helper
d97172683641 squashfs: provide backing_dev_info in order to disable read-ahead
(From OE-Core rev: 6dd61c0dc143e53acddd3a181298b18bb8bc789a)
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 474ddb758dd1b327540e48ccfe1500fb4231f30b)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb | 4 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb | 4 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_5.15.bb | 24 |
3 files changed, 16 insertions, 16 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb index fc1ccd9b39..bd57d7c47e 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.15.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 ?= "a0d36398b257c555381e735cd721cd8479d6762d" | 14 | SRCREV_machine ?= "9860fe27332e09dd4f0f3b303e40377de083be9a" |
15 | SRCREV_meta ?= "f475b1a9deddbde23f48d7d535abdd5fb133b837" | 15 | SRCREV_meta ?= "c2d64b008142d2a2bc9c8cca8a3d579a62275122" |
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.15;destsuffix=${KMETA}" | 18 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.15;destsuffix=${KMETA}" |
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb index 087c30b5a5..8b83b5a8de 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb | |||
@@ -14,8 +14,8 @@ DEPENDS += "openssl-native util-linux-native" | |||
14 | KMETA = "kernel-meta" | 14 | KMETA = "kernel-meta" |
15 | KCONF_BSP_AUDIT_LEVEL = "2" | 15 | KCONF_BSP_AUDIT_LEVEL = "2" |
16 | 16 | ||
17 | SRCREV_machine ?= "1c3448ff6cc6d24d16c6ef6065cb642245cac627" | 17 | SRCREV_machine ?= "86627fc3da74aefec1338724a597356e6b8ad88b" |
18 | SRCREV_meta ?= "f475b1a9deddbde23f48d7d535abdd5fb133b837" | 18 | SRCREV_meta ?= "c2d64b008142d2a2bc9c8cca8a3d579a62275122" |
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_5.15.bb b/meta/recipes-kernel/linux/linux-yocto_5.15.bb index d5f21daf35..0b373c40fe 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.15.bb | |||
@@ -13,24 +13,24 @@ KBRANCH:qemux86 ?= "v5.15/standard/base" | |||
13 | KBRANCH:qemux86-64 ?= "v5.15/standard/base" | 13 | KBRANCH:qemux86-64 ?= "v5.15/standard/base" |
14 | KBRANCH:qemumips64 ?= "v5.15/standard/mti-malta64" | 14 | KBRANCH:qemumips64 ?= "v5.15/standard/mti-malta64" |
15 | 15 | ||
16 | SRCREV_machine:qemuarm ?= "d3aa5916b2b02966ef37bfe3fc527c99754571ec" | 16 | SRCREV_machine:qemuarm ?= "4915b05912ee7d15224eb9064ca63678f0bc6815" |
17 | SRCREV_machine:qemuarm64 ?= "a1d364fbe3d8a916426a107f07b89fd0338923c7" | 17 | SRCREV_machine:qemuarm64 ?= "660bf605998f60fd77f24d3316b95b14ef2fa035" |
18 | SRCREV_machine:qemumips ?= "904de7b55a7e8edf4cd894fb0558efee799a314a" | 18 | SRCREV_machine:qemumips ?= "38bf282c052b70c1c6dd79dc6ae49da1ec1c7de8" |
19 | SRCREV_machine:qemuppc ?= "35d547b91124bef128a13402190ca05f54a2392e" | 19 | SRCREV_machine:qemuppc ?= "ac4a5d99364cede21dc1838213f7fb29e1735969" |
20 | SRCREV_machine:qemuriscv64 ?= "8cd3f1c8dc13e8fa2d9a25ce0285d3526705eea7" | 20 | SRCREV_machine:qemuriscv64 ?= "1c5699ee85d4ffe1be2bea17f4587375bf3877f6" |
21 | SRCREV_machine:qemuriscv32 ?= "8cd3f1c8dc13e8fa2d9a25ce0285d3526705eea7" | 21 | SRCREV_machine:qemuriscv32 ?= "1c5699ee85d4ffe1be2bea17f4587375bf3877f6" |
22 | SRCREV_machine:qemux86 ?= "8cd3f1c8dc13e8fa2d9a25ce0285d3526705eea7" | 22 | SRCREV_machine:qemux86 ?= "1c5699ee85d4ffe1be2bea17f4587375bf3877f6" |
23 | SRCREV_machine:qemux86-64 ?= "8cd3f1c8dc13e8fa2d9a25ce0285d3526705eea7" | 23 | SRCREV_machine:qemux86-64 ?= "1c5699ee85d4ffe1be2bea17f4587375bf3877f6" |
24 | SRCREV_machine:qemumips64 ?= "ae8ab2e3acaf9e14cd75a6c96f1ba43c66a1babd" | 24 | SRCREV_machine:qemumips64 ?= "2923c39cc815e2109c9bfc0985adcd8d342fc415" |
25 | SRCREV_machine ?= "8cd3f1c8dc13e8fa2d9a25ce0285d3526705eea7" | 25 | SRCREV_machine ?= "1c5699ee85d4ffe1be2bea17f4587375bf3877f6" |
26 | SRCREV_meta ?= "f475b1a9deddbde23f48d7d535abdd5fb133b837" | 26 | SRCREV_meta ?= "c2d64b008142d2a2bc9c8cca8a3d579a62275122" |
27 | 27 | ||
28 | # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll | 28 | # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll |
29 | # get the <version>/base branch, which is pure upstream -stable, and the same | 29 | # get the <version>/base branch, which is pure upstream -stable, and the same |
30 | # meta SRCREV as the linux-yocto-standard builds. Select your version using the | 30 | # meta SRCREV as the linux-yocto-standard builds. Select your version using the |
31 | # normal PREFERRED_VERSION settings. | 31 | # normal PREFERRED_VERSION settings. |
32 | BBCLASSEXTEND = "devupstream:target" | 32 | BBCLASSEXTEND = "devupstream:target" |
33 | SRCREV_machine:class-devupstream ?= "509a32764e1a5692935c4f26ed96fbe94c480186" | 33 | SRCREV_machine:class-devupstream ?= "71e496bd338221709b180b60ba419fa542c2b320" |
34 | PN:class-devupstream = "linux-yocto-upstream" | 34 | PN:class-devupstream = "linux-yocto-upstream" |
35 | KBRANCH:class-devupstream = "v5.15/base" | 35 | KBRANCH:class-devupstream = "v5.15/base" |
36 | 36 | ||