diff options
| author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2023-09-05 10:37:07 -0400 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-09-07 07:53:50 +0100 |
| commit | 08b7b96dd894c0816974dfea62d044ce75f1acca (patch) | |
| tree | b75eb452600fe9a8390539d86ad94e6d08cd674e /meta/recipes-kernel | |
| parent | fad769ae8b3b520ea7e881ac7dca6080cbe7c2e0 (diff) | |
| download | poky-08b7b96dd894c0816974dfea62d044ce75f1acca.tar.gz | |
linux-yocto/6.4: fix CONFIG_F2FS_IO_TRACE configuration warning
Integrating the following commit(s) to linux-yocto/.:
97bba4db5ff features/f2fs: remove CONFIG_F2FS_IO_TRACE
(From OE-Core rev: 691bc6f7e064560d57d0546e163c524c64a5e79d)
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.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.4.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_6.4.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_6.4.bb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_6.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_6.4.bb index 3c168def2c..7dd3f36325 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_6.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_6.4.bb | |||
| @@ -15,7 +15,7 @@ python () { | |||
| 15 | } | 15 | } |
| 16 | 16 | ||
| 17 | SRCREV_machine ?= "7b9505550d7a84a1f30b9af8b90aafc8dde37023" | 17 | SRCREV_machine ?= "7b9505550d7a84a1f30b9af8b90aafc8dde37023" |
| 18 | SRCREV_meta ?= "d9483a24c9ee33b6e566baa5233cbd9feaeb5212" | 18 | SRCREV_meta ?= "97bba4db5ff86eae2ca28a8bf0cb8cbfa44cbbe4" |
| 19 | 19 | ||
| 20 | SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine;protocol=https \ | 20 | SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine;protocol=https \ |
| 21 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.4;destsuffix=${KMETA};protocol=https" | 21 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.4;destsuffix=${KMETA};protocol=https" |
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_6.4.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_6.4.bb index 721b52bc8a..baeca1a968 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_6.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_6.4.bb | |||
| @@ -18,7 +18,7 @@ KMETA = "kernel-meta" | |||
| 18 | KCONF_BSP_AUDIT_LEVEL = "2" | 18 | KCONF_BSP_AUDIT_LEVEL = "2" |
| 19 | 19 | ||
| 20 | SRCREV_machine ?= "9753b4497951a5bd1a921e784532257d26a8b008" | 20 | SRCREV_machine ?= "9753b4497951a5bd1a921e784532257d26a8b008" |
| 21 | SRCREV_meta ?= "d9483a24c9ee33b6e566baa5233cbd9feaeb5212" | 21 | SRCREV_meta ?= "97bba4db5ff86eae2ca28a8bf0cb8cbfa44cbbe4" |
| 22 | 22 | ||
| 23 | PV = "${LINUX_VERSION}+git" | 23 | PV = "${LINUX_VERSION}+git" |
| 24 | 24 | ||
diff --git a/meta/recipes-kernel/linux/linux-yocto_6.4.bb b/meta/recipes-kernel/linux/linux-yocto_6.4.bb index 52accc9f87..23af9167a5 100644 --- a/meta/recipes-kernel/linux/linux-yocto_6.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto_6.4.bb | |||
| @@ -29,7 +29,7 @@ SRCREV_machine:qemux86 ?= "9753b4497951a5bd1a921e784532257d26a8b008" | |||
| 29 | SRCREV_machine:qemux86-64 ?= "9753b4497951a5bd1a921e784532257d26a8b008" | 29 | SRCREV_machine:qemux86-64 ?= "9753b4497951a5bd1a921e784532257d26a8b008" |
| 30 | SRCREV_machine:qemumips64 ?= "de0569e0860973391d16074bbe9366afb15594bf" | 30 | SRCREV_machine:qemumips64 ?= "de0569e0860973391d16074bbe9366afb15594bf" |
| 31 | SRCREV_machine ?= "9753b4497951a5bd1a921e784532257d26a8b008" | 31 | SRCREV_machine ?= "9753b4497951a5bd1a921e784532257d26a8b008" |
| 32 | SRCREV_meta ?= "d9483a24c9ee33b6e566baa5233cbd9feaeb5212" | 32 | SRCREV_meta ?= "97bba4db5ff86eae2ca28a8bf0cb8cbfa44cbbe4" |
| 33 | 33 | ||
| 34 | # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll | 34 | # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll |
| 35 | # get the <version>/base branch, which is pure upstream -stable, and the same | 35 | # get the <version>/base branch, which is pure upstream -stable, and the same |
