diff options
| author |   Bruce Ashfield <bruce.ashfield@gmail.com> | 2024-04-10 12:31:30 -0400 |
|---|---|---|
| committer |   Steve Sakoman <steve@sakoman.com> | 2024-04-11 05:14:02 -0700 |
| commit | ef686e3ee6e68c11eebe3a42465225bfa6d08e0b (patch) | |
| tree | ff6d0e89762b8b5296013b1779246059e9c541e7 /meta | |
| parent | dd36d66e23cb0f9d182b25f564f355202b71c7e7 (diff) | |
| download | openembedded-core-ef686e3ee6e68c11eebe3a42465225bfa6d08e0b.tar.gz | |
linux-yocto/5.4: configuration warning fixes
Integrating the following commit(s) to linux-yocto/.:
1/2 [
Author: Bruce Ashfield
Email: bruce.ashfield@gmail.com
Subject: net/cfg: remove CONFIG_NET_SCH_CBQ
Date: Thu, 6 Jul 2023 12:39:20 -0400
commit 051d442098421c28c7 [net/sched: Retire CBQ qdisc] removes
CONFIG_NET_SCH_CBQ from the tree, so we drop it from our fragments.
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
]
2/2 [
Author: Bruce Ashfield
Email: bruce.ashfield@gmail.com
Subject: cfg/net: remove CONFIG_NET_SCH_DSMARK
Date: Thu, 6 Jul 2023 12:42:07 -0400
commit bbe77c14ee6185a61b [net/sched: Retire dsmark qdisc] upstream
has removed CONFIG_NET_SCH_DSMARK so we drop it from our fragments
as well.
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
]
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_5.4.bb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb index 89b8d2b825..f912304858 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb @@ -12,7 +12,7 @@ python () { } SRCREV_machine ?= "c93e75bc334ba00df2d66411a0d79c4378cf4af8" -SRCREV_meta ?= "c841eec84cf56e6b837f12a359c35c5dfb26da5f" +SRCREV_meta ?= "ecd382f3477fae022ad1881e4c39e810cdc3c760" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA}" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb index 6e049b03f9..2f94782471 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb @@ -17,7 +17,7 @@ KCONF_BSP_AUDIT_LEVEL = "2" SRCREV_machine_qemuarm ?= "d29f3f3a932319053ad24d84b087b0a57908c1bc" SRCREV_machine ?= "b6480d09d84d09e7560daa5c1d73917292ae30c0" -SRCREV_meta ?= "c841eec84cf56e6b837f12a359c35c5dfb26da5f" +SRCREV_meta ?= "ecd382f3477fae022ad1881e4c39e810cdc3c760" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_5.4.bb b/meta/recipes-kernel/linux/linux-yocto_5.4.bb index 2a659e32fd..108043bd98 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.4.bb @@ -22,7 +22,7 @@ SRCREV_machine_qemux86 ?= "fe901e2f4b156e9cf7ddb03f479f7339d28e398b" SRCREV_machine_qemux86-64 ?= "fe901e2f4b156e9cf7ddb03f479f7339d28e398b" SRCREV_machine_qemumips64 ?= "f59947f338319b1741db5dfac34f08399561ab25" SRCREV_machine ?= "fe901e2f4b156e9cf7ddb03f479f7339d28e398b" -SRCREV_meta ?= "c841eec84cf56e6b837f12a359c35c5dfb26da5f" +SRCREV_meta ?= "ecd382f3477fae022ad1881e4c39e810cdc3c760" # remap qemuarm to qemuarma15 for the 5.4 kernel # KMACHINE_qemuarm ?= "qemuarma15" |