summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2024-04-10 12:31:30 -0400
committerSteve Sakoman <steve@sakoman.com>2024-04-13 04:51:47 -0700
commit9e53801f463064a083cac9d4cab4902ce48ce5ff (patch)
treee813f7bee5446b7d97c1d91e230b165edd859c11
parent30c2cb6ba4ae87583799daec1c698029f99d94c6 (diff)
downloadpoky-9e53801f463064a083cac9d4cab4902ce48ce5ff.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> ] (From OE-Core rev: ef686e3ee6e68c11eebe3a42465225bfa6d08e0b) Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> Signed-off-by: Steve Sakoman <steve@sakoman.com>
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_5.4.bb2
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 () {
12} 12}
13 13
14SRCREV_machine ?= "c93e75bc334ba00df2d66411a0d79c4378cf4af8" 14SRCREV_machine ?= "c93e75bc334ba00df2d66411a0d79c4378cf4af8"
15SRCREV_meta ?= "c841eec84cf56e6b837f12a359c35c5dfb26da5f" 15SRCREV_meta ?= "ecd382f3477fae022ad1881e4c39e810cdc3c760"
16 16
17SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ 17SRC_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.4;destsuffix=${KMETA}" 18 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"
17 17
18SRCREV_machine_qemuarm ?= "d29f3f3a932319053ad24d84b087b0a57908c1bc" 18SRCREV_machine_qemuarm ?= "d29f3f3a932319053ad24d84b087b0a57908c1bc"
19SRCREV_machine ?= "b6480d09d84d09e7560daa5c1d73917292ae30c0" 19SRCREV_machine ?= "b6480d09d84d09e7560daa5c1d73917292ae30c0"
20SRCREV_meta ?= "c841eec84cf56e6b837f12a359c35c5dfb26da5f" 20SRCREV_meta ?= "ecd382f3477fae022ad1881e4c39e810cdc3c760"
21 21
22PV = "${LINUX_VERSION}+git${SRCPV}" 22PV = "${LINUX_VERSION}+git${SRCPV}"
23 23
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"
22SRCREV_machine_qemux86-64 ?= "fe901e2f4b156e9cf7ddb03f479f7339d28e398b" 22SRCREV_machine_qemux86-64 ?= "fe901e2f4b156e9cf7ddb03f479f7339d28e398b"
23SRCREV_machine_qemumips64 ?= "f59947f338319b1741db5dfac34f08399561ab25" 23SRCREV_machine_qemumips64 ?= "f59947f338319b1741db5dfac34f08399561ab25"
24SRCREV_machine ?= "fe901e2f4b156e9cf7ddb03f479f7339d28e398b" 24SRCREV_machine ?= "fe901e2f4b156e9cf7ddb03f479f7339d28e398b"
25SRCREV_meta ?= "c841eec84cf56e6b837f12a359c35c5dfb26da5f" 25SRCREV_meta ?= "ecd382f3477fae022ad1881e4c39e810cdc3c760"
26 26
27# remap qemuarm to qemuarma15 for the 5.4 kernel 27# remap qemuarm to qemuarma15 for the 5.4 kernel
28# KMACHINE_qemuarm ?= "qemuarma15" 28# KMACHINE_qemuarm ?= "qemuarma15"