diff mbox series

[scarthgap] u-boot-tools: use all patches from u-boot

Message ID 20260923173850.21338-1-peter.marko@siemens.com
State New
Headers show
Series [scarthgap] u-boot-tools: use all patches from u-boot | expand

Commit Message

Peter Marko Sept. 23, 2026, 5:38 p.m. UTC 
From: Peter Marko <peter.marko@siemens.com>

After sharing CVE_PRODUCT between u-boot and u-boot-tools CVEs
patched in u-boot showed-up in CVE reports for u-boot-tools.

It does not make much sense to share git repository but not share all
patches on top of it, so move adding all patches from u-boot recipe to a
common include file where also the git repository is defined.

Signed-off-by: Peter Marko <peter.marko@siemens.com>
---
 meta/recipes-bsp/u-boot/u-boot-common.inc       | 10 ++++++++++
 meta/recipes-bsp/u-boot/u-boot-tools_2024.01.bb |  2 --
 meta/recipes-bsp/u-boot/u-boot_2024.01.bb       | 12 ------------
 3 files changed, 10 insertions(+), 14 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 27e6ac9db5b..6d388fadedc 100644
--- a/meta/recipes-bsp/u-boot/u-boot-common.inc
+++ b/meta/recipes-bsp/u-boot/u-boot-common.inc
@@ -18,6 +18,16 @@  SRCREV = "866ca972d6c3cabeaf6dbac431e8e08bb30b3c8e"
 
 SRC_URI = "git://source.denx.de/u-boot/u-boot.git;protocol=https;branch=master \
            file://CVE-2025-24857.patch \
+           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 \
+           file://CVE-2026-46728.patch \
 "
 
 S = "${WORKDIR}/git"
diff --git a/meta/recipes-bsp/u-boot/u-boot-tools_2024.01.bb b/meta/recipes-bsp/u-boot/u-boot-tools_2024.01.bb
index 4b6d89ed4e1..7eaf721ca83 100644
--- a/meta/recipes-bsp/u-boot/u-boot-tools_2024.01.bb
+++ b/meta/recipes-bsp/u-boot/u-boot-tools_2024.01.bb
@@ -1,4 +1,2 @@ 
 require u-boot-common.inc
 require u-boot-tools.inc
-
-SRC_URI += "file://CVE-2026-46728.patch"
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 7eaeed1004b..945398c90e4 100644
--- a/meta/recipes-bsp/u-boot/u-boot_2024.01.bb
+++ b/meta/recipes-bsp/u-boot/u-boot_2024.01.bb
@@ -2,15 +2,3 @@  require u-boot-common.inc
 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 \
-            file://CVE-2026-46728.patch \
-"