From ef014bdb96bbd2e3f2238a3acc3e04256e07d2f4 Mon Sep 17 00:00:00 2001 From: Yoann Congal Date: Tue, 24 Feb 2026 10:29:19 +0100 Subject: [PATCH] u-boot: move CVE patches out of the common .inc file 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 (From OE-Core rev: f4ced8ff03147dd532a88cf3ce08d61fab057522) Signed-off-by: Yoann Congal Signed-off-by: Paul Barker Signed-off-by: Richard Purdie --- 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 --git a/meta/recipes-bsp/u-boot/u-boot-common.inc b/meta/recipes-bsp/u-boot/u-boot-common.inc index da34e3d3e8..1f17bd7d0a 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 b15bcaa818..e412f503f1 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 \ +"