diff options
author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2023-09-05 10:37:08 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-09-07 07:53:50 +0100 |
commit | 46d6aa221f575bfa84a1cef8f459a93922c64685 (patch) | |
tree | 23f5976f5bb5bc43ee188cc434d2988a04d3310d /meta | |
parent | 08b7b96dd894c0816974dfea62d044ce75f1acca (diff) | |
download | poky-46d6aa221f575bfa84a1cef8f459a93922c64685.tar.gz |
linux-yocto/6.1: fix CONFIG_F2FS_IO_TRACE configuration warning
Integrating the following commit(s) to linux-yocto/.:
70924d2512b features/f2fs: remove CONFIG_F2FS_IO_TRACE
(From OE-Core rev: dabdc29e96e962e1b917bdcee2d38d654e28dab5)
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb | 2 | ||||
-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, 3 insertions, 3 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 be2110ecc9..c78e248cfd 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb | |||
@@ -15,7 +15,7 @@ python () { | |||
15 | } | 15 | } |
16 | 16 | ||
17 | SRCREV_machine ?= "9d355978d3a95f5c190a21d95ebb2a5d0e638537" | 17 | SRCREV_machine ?= "9d355978d3a95f5c190a21d95ebb2a5d0e638537" |
18 | SRCREV_meta ?= "295d37e268bc02070da670e46456227bee38795b" | 18 | SRCREV_meta ?= "70924d2512b8c20567fade72a22781b9bee3206c" |
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.1;destsuffix=${KMETA};protocol=https" | 21 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.1;destsuffix=${KMETA};protocol=https" |
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 6b452f3803..93bda2eca2 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.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 ?= "44fd0c7a5a7955282a1ab24bf3dcdee068839ad2" | 20 | SRCREV_machine ?= "44fd0c7a5a7955282a1ab24bf3dcdee068839ad2" |
21 | SRCREV_meta ?= "295d37e268bc02070da670e46456227bee38795b" | 21 | SRCREV_meta ?= "70924d2512b8c20567fade72a22781b9bee3206c" |
22 | 22 | ||
23 | PV = "${LINUX_VERSION}+git" | 23 | PV = "${LINUX_VERSION}+git" |
24 | 24 | ||
diff --git a/meta/recipes-kernel/linux/linux-yocto_6.1.bb b/meta/recipes-kernel/linux/linux-yocto_6.1.bb index b4601f583e..d1a4bc8538 100644 --- a/meta/recipes-kernel/linux/linux-yocto_6.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto_6.1.bb | |||
@@ -29,7 +29,7 @@ SRCREV_machine:qemux86 ?= "44fd0c7a5a7955282a1ab24bf3dcdee068839ad2" | |||
29 | SRCREV_machine:qemux86-64 ?= "44fd0c7a5a7955282a1ab24bf3dcdee068839ad2" | 29 | SRCREV_machine:qemux86-64 ?= "44fd0c7a5a7955282a1ab24bf3dcdee068839ad2" |
30 | SRCREV_machine:qemumips64 ?= "296b096f4c747e4c4b31b1708fc8a0acb1dac04e" | 30 | SRCREV_machine:qemumips64 ?= "296b096f4c747e4c4b31b1708fc8a0acb1dac04e" |
31 | SRCREV_machine ?= "44fd0c7a5a7955282a1ab24bf3dcdee068839ad2" | 31 | SRCREV_machine ?= "44fd0c7a5a7955282a1ab24bf3dcdee068839ad2" |
32 | SRCREV_meta ?= "295d37e268bc02070da670e46456227bee38795b" | 32 | SRCREV_meta ?= "70924d2512b8c20567fade72a22781b9bee3206c" |
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 |