From 6c1b1ffd9436a409b3f5be0af34d46384c7a8e32 Mon Sep 17 00:00:00 2001
From: Clemens Terasa <clemens.terasa@garz-fricke.com>
Date: Thu, 10 Mar 2022 19:57:51 +0100
Subject: [PATCH] linux-guf: Upgrade kernel to 5.10.104
Update the kernel to 5.10.104. This should pull the latest security
fixes, i.e. for CVE-2022-0847.
With this it seems to be necessary to disable
CONFIG_STACKPROTECTOR_PER_TASK to build it inside Yocto dunfell.
It seems to be a problem of missing headers inside gcc-plugin.
Remove the PREFERRED kernel variables from imx6ull, that are derived
from guf.inc.
BCS 746-000735
---
conf/machine/imx6ullguf.conf | 3 ---
conf/machine/include/guf.inc | 2 +-
recipes-kernel/linux/linux-guf_5.10.bb | 2 +-
3 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/conf/machine/imx6ullguf.conf b/conf/machine/imx6ullguf.conf
index 5f1bd16d..a3416e77 100644
--- a/conf/machine/imx6ullguf.conf
+++ b/conf/machine/imx6ullguf.conf
@@ -9,9 +9,6 @@ require conf/machine/include/tune-cortexa7.inc
MACHINEOVERRIDES =. "imxpxp:"
SOC_FAMILY = "imx:mx6:mx6ull"
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-guf"
-PREFERRED_VERSION_linux-guf ?= "5.10.57"
-
MACHINE_ESSENTIAL_EXTRA_RDEPENDS += " \
kernel-module-imx6-spreadspectrum \
"
diff --git a/conf/machine/include/guf.inc b/conf/machine/include/guf.inc
index a1a0d142..a9fda85d 100644
--- a/conf/machine/include/guf.inc
+++ b/conf/machine/include/guf.inc
@@ -1,7 +1,7 @@
require conf/machine/include/soc-family.inc
PREFERRED_PROVIDER_virtual/kernel ??= "linux-guf"
-PREFERRED_VERSION_linux-guf ??= "5.10.57"
+PREFERRED_VERSION_linux-guf ??= "5.10.104"
KERNEL_IMAGETYPE = "uImage"
KBUILD_BUILD_USER := "support"
diff --git a/recipes-kernel/linux/linux-guf_5.10.bb b/recipes-kernel/linux/linux-guf_5.10.bb
index ea8857a1..d6fe8a23 100644
--- a/recipes-kernel/linux/linux-guf_5.10.bb
+++ b/recipes-kernel/linux/linux-guf_5.10.bb
@@ -11,7 +11,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/linux-guf-${LINUX_VERSION}:"
S = "${WORKDIR}/git"
-PV = "5.10.57"
+PV = "5.10.104"
SRCREV = "${AUTOREV}"
LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
--
GitLab