From edfed2c359f0325c9f7872141294c7677ff80191 Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Date: Fri, 6 Sep 2024 14:02:44 -0400
Subject: [PATCH] linux-yocto/5.10: remove obsolete options
Integrating the following commit(s) to linux-yocto/.:
1/1 [
Author: Wenlin Kang
Email: wenlin.kang@windriver.com
Subject: net_sched: remove NET_SCH_CBQ and NET_SCH_DSMARK
Date: Tue, 18 Jun 2024 18:41:49 +0800
The two configs have been removed from kernel source in commit 56a6720d9bc3
and 3fa31e7a9d3a, so here also remove them to fix warning.
WARNING: linux-yocto-5.10.216+gitAUTOINC+c658f078fe_bcf06546f5-r0 do_kernel_configcheck: [kernel config]: This BSP contains fragments with warnings:
[INFO]: the following symbols were not found in the active configuration:
- CONFIG_NET_SCH_CBQ
- CONFIG_NET_SCH_DSMARK
Signed-off-by: Wenlin Kang <wenlin.kang@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
]
(From OE-Core rev: 1f3046818f6f93366ad5ef3fb17cc1052f075b3d)
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
.../linux/linux-yocto-rt_5.10.bb | 4 ++--
.../linux/linux-yocto-tiny_5.10.bb | 6 ++---
meta/recipes-kernel/linux/linux-yocto_5.10.bb | 22 +++++++++----------
3 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb
index 9c37ea8a153..bc4e49ca083 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb
@@ -11,8 +11,8 @@ python () {
raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
}
-SRCREV_machine ?= "6ed671f36a091fc09ca9ee804ff959bc7d6eb4c1"
-SRCREV_meta ?= "c658f078fe16bd2689f39a713bf17be1874bae53"
+SRCREV_machine ?= "421ad32504cf202dafd09394bae1ad6521539a49"
+SRCREV_meta ?= "19c510890b99cfc450db69a97cf585593deb1d95"
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.10;destsuffix=${KMETA}"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb
index 2cf94cc9f61..d2e540847ae 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb
@@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native"
KMETA = "kernel-meta"
KCONF_BSP_AUDIT_LEVEL = "2"
-SRCREV_machine:qemuarm ?= "a897f5860a61c0bd5eac9780b292dba2f158a33b"
-SRCREV_machine ?= "5506a25c2de1ff6956b79138000301f344a6e869"
-SRCREV_meta ?= "c658f078fe16bd2689f39a713bf17be1874bae53"
+SRCREV_machine:qemuarm ?= "cf393a05f2ba24f3bc5f3727a5fe9dc63ec247bd"
+SRCREV_machine ?= "9f2e7d21741259c175f6186577bd82f82cb1f96a"
+SRCREV_meta ?= "19c510890b99cfc450db69a97cf585593deb1d95"
PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto_5.10.bb b/meta/recipes-kernel/linux/linux-yocto_5.10.bb
index 97772390b2c..cb03649545f 100644
--- a/meta/recipes-kernel/linux/linux-yocto_5.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_5.10.bb
@@ -14,17 +14,17 @@ KBRANCH:qemux86 ?= "v5.10/standard/base"
KBRANCH:qemux86-64 ?= "v5.10/standard/base"
KBRANCH:qemumips64 ?= "v5.10/standard/mti-malta64"
-SRCREV_machine:qemuarm ?= "590d7093102d1def24e8034ee0be799797b62a5f"
-SRCREV_machine:qemuarm64 ?= "b1dc4c88ed9dd6e6abe2886bf765ebb741070c7e"
-SRCREV_machine:qemumips ?= "c09fe97a7469eb7a20cc60e9fb759ad433a78b91"
-SRCREV_machine:qemuppc ?= "9f1cff9c0409729a3aa098e411e4b20cf1d94001"
-SRCREV_machine:qemuriscv64 ?= "a035e16d75c1cd721091559a771bf967d5fa03f7"
-SRCREV_machine:qemuriscv32 ?= "a035e16d75c1cd721091559a771bf967d5fa03f7"
-SRCREV_machine:qemux86 ?= "a035e16d75c1cd721091559a771bf967d5fa03f7"
-SRCREV_machine:qemux86-64 ?= "a035e16d75c1cd721091559a771bf967d5fa03f7"
-SRCREV_machine:qemumips64 ?= "9fc7eb5bd92e22ec62caa3a1896b967109095916"
-SRCREV_machine ?= "a035e16d75c1cd721091559a771bf967d5fa03f7"
-SRCREV_meta ?= "c658f078fe16bd2689f39a713bf17be1874bae53"
+SRCREV_machine:qemuarm ?= "ebf8b0d0c68aeca12d7f7a2fa35c2991e23f5ae4"
+SRCREV_machine:qemuarm64 ?= "9837e97ae4ced4fdb9250acd275ad1decfde6e5e"
+SRCREV_machine:qemumips ?= "18f0ddf9859784df80af64e4d6f9a41c49b8b1f4"
+SRCREV_machine:qemuppc ?= "c0adf44845851025b1a18c50927af16a7d049ab8"
+SRCREV_machine:qemuriscv64 ?= "4af417c06d37be4517a786aef96716f13b4b7f3b"
+SRCREV_machine:qemuriscv32 ?= "4af417c06d37be4517a786aef96716f13b4b7f3b"
+SRCREV_machine:qemux86 ?= "4af417c06d37be4517a786aef96716f13b4b7f3b"
+SRCREV_machine:qemux86-64 ?= "4af417c06d37be4517a786aef96716f13b4b7f3b"
+SRCREV_machine:qemumips64 ?= "5341a9dbcda59f3c95aed519a6b86e96cd6fdf65"
+SRCREV_machine ?= "4af417c06d37be4517a786aef96716f13b4b7f3b"
+SRCREV_meta ?= "19c510890b99cfc450db69a97cf585593deb1d95"
SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \
git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.10;destsuffix=${KMETA}"
--
GitLab