diff mbox series

[scarthgap,44/44] u-boot: move CVE patches out of the common .inc file

Message ID 94a2960e1ae3923599affb6b227ef3f1870f5633.1771943404.git.yoann.congal@smile.fr
State RFC, archived
Delegated to: Yoann Congal
Headers show
Series [scarthgap,01/44] pseudo: Update to include a fix for systems with kernel <5.6 | expand

Commit Message

Yoann Congal Feb. 24, 2026, 2:32 p.m. UTC 
From: Yoann Congal <yoann.congal@smile.fr>

An external layer might use the u-boot*.inc files but have a different
base version for which the CVE patches don't apply.

Move the CVE patches in the leaf recipe.

See related patch in kirkstone:
[kirkstone][PATCH] u-boot: move CVE patch out of u-boot-common.inc
https://lists.openembedded.org/g/openembedded-core/topic/117385432

Signed-off-by: Yoann Congal <yoann.congal@smile.fr>
---
 meta/recipes-bsp/u-boot/u-boot-common.inc | 12 +-----------
 meta/recipes-bsp/u-boot/u-boot_2024.01.bb | 10 ++++++++++
 2 files changed, 11 insertions(+), 11 deletions(-)
diff mbox series

Patch

diff --git a/meta/recipes-bsp/u-boot/u-boot-common.inc b/meta/recipes-bsp/u-boot/u-boot-common.inc
index da34e3d3e80..1f17bd7d0af 100644
--- a/meta/recipes-bsp/u-boot/u-boot-common.inc
+++ b/meta/recipes-bsp/u-boot/u-boot-common.inc
@@ -14,17 +14,7 @@  PE = "1"
 # repo during parse
 SRCREV = "866ca972d6c3cabeaf6dbac431e8e08bb30b3c8e"
 
-SRC_URI = "git://source.denx.de/u-boot/u-boot.git;protocol=https;branch=master \
-           file://CVE-2024-57254.patch \
-           file://CVE-2024-57255.patch \
-           file://CVE-2024-57256.patch \
-           file://CVE-2024-57257.patch \
-           file://CVE-2024-57258-1.patch \
-           file://CVE-2024-57258-2.patch \
-           file://CVE-2024-57258-3.patch \
-           file://CVE-2024-57259.patch \
-           file://CVE-2024-42040.patch \
-"
+SRC_URI = "git://source.denx.de/u-boot/u-boot.git;protocol=https;branch=master"
 
 S = "${WORKDIR}/git"
 B = "${WORKDIR}/build"
diff --git a/meta/recipes-bsp/u-boot/u-boot_2024.01.bb b/meta/recipes-bsp/u-boot/u-boot_2024.01.bb
index b15bcaa818f..e412f503f10 100644
--- a/meta/recipes-bsp/u-boot/u-boot_2024.01.bb
+++ b/meta/recipes-bsp/u-boot/u-boot_2024.01.bb
@@ -3,3 +3,13 @@  require u-boot.inc
 
 DEPENDS += "bc-native dtc-native python3-pyelftools-native"
 
+SRC_URI += "file://CVE-2024-57254.patch \
+            file://CVE-2024-57255.patch \
+            file://CVE-2024-57256.patch \
+            file://CVE-2024-57257.patch \
+            file://CVE-2024-57258-1.patch \
+            file://CVE-2024-57258-2.patch \
+            file://CVE-2024-57258-3.patch \
+            file://CVE-2024-57259.patch \
+            file://CVE-2024-42040.patch \
+"