Rather than carrying multiple patches for the same fix for all of the u-boot versions, we should copy the meta-arm solution [1] of just adding a build option to turn on the engine stubs.
[1] https://patchwork.yoctoproject.org/project/arm/patch/[email protected]/ Suggested-by: Denys Dmytriyenko (TI) <[email protected]> Signed-off-by: Ryan Eatmon <[email protected]> --- v2: No change meta-beagle/recipes-bsp/u-boot/u-boot-bb.org_2024.10.bb | 5 +++++ meta-beagle/recipes-bsp/u-boot/u-boot-bb.org_2025.10.bb | 5 +++++ meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2024.04.bb | 5 +++++ meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2025.01.bb | 5 +++++ meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2026.01.bb | 5 +++++ 5 files changed, 25 insertions(+) diff --git a/meta-beagle/recipes-bsp/u-boot/u-boot-bb.org_2024.10.bb b/meta-beagle/recipes-bsp/u-boot/u-boot-bb.org_2024.10.bb index 23a5a3af..58108945 100644 --- a/meta-beagle/recipes-bsp/u-boot/u-boot-bb.org_2024.10.bb +++ b/meta-beagle/recipes-bsp/u-boot/u-boot-bb.org_2024.10.bb @@ -13,3 +13,8 @@ UBOOT_GIT_URI = "git://github.com/beagleboard/u-boot.git" UBOOT_GIT_PROTOCOL = "https" BRANCH = "v2024.10-Beagle" SRCREV = "bf0e9d0b7274d2b561bd24c858affec2038250f9" + +# u-boot/lib/rsa/rsa-sign.c uses the OpenSSL engine API, but this has been +# removed from OpenSSL 4. Upstream u-boot has been fixed but we can enable +# the stub engine API in OpenSSL until this recipe is removed. +BUILD_CFLAGS += "-DOPENSSL_ENGINE_STUBS" diff --git a/meta-beagle/recipes-bsp/u-boot/u-boot-bb.org_2025.10.bb b/meta-beagle/recipes-bsp/u-boot/u-boot-bb.org_2025.10.bb index a6284193..5070eef4 100644 --- a/meta-beagle/recipes-bsp/u-boot/u-boot-bb.org_2025.10.bb +++ b/meta-beagle/recipes-bsp/u-boot/u-boot-bb.org_2025.10.bb @@ -20,3 +20,8 @@ SRC_URI:append:pocketbeagle2 = " file://bootcmd-ti-mmc.cfg" SRC_URI:append:beaglebone = " file://0001-arm-dts-am335x-pocketbeagle-Add-tick-timer.patch" SRC_URI += "file://0001-pylibfdt-Replace-removed-SWIG-Python-2-compatibility.patch" + +# u-boot/lib/rsa/rsa-sign.c uses the OpenSSL engine API, but this has been +# removed from OpenSSL 4. Upstream u-boot has been fixed but we can enable +# the stub engine API in OpenSSL until this recipe is removed. +BUILD_CFLAGS += "-DOPENSSL_ENGINE_STUBS" diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2024.04.bb b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2024.04.bb index d3a78d8b..8d641bbe 100644 --- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2024.04.bb +++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2024.04.bb @@ -7,3 +7,8 @@ BRANCH = "ti-u-boot-2024.04" SRC_URI += "file://0001-scripts-dtc-pylibfdt-libfdt.i_shipped-Use-SWIG_Appen.patch" SRCREV_uboot = "29d0c23d67ee7b88e46fe1753cd020e2b04c2ef6" + +# u-boot/lib/rsa/rsa-sign.c uses the OpenSSL engine API, but this has been +# removed from OpenSSL 4. Upstream u-boot has been fixed but we can enable +# the stub engine API in OpenSSL until this recipe is removed. +BUILD_CFLAGS += "-DOPENSSL_ENGINE_STUBS" diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2025.01.bb b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2025.01.bb index f7475c2b..2b28383b 100644 --- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2025.01.bb +++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2025.01.bb @@ -7,3 +7,8 @@ BRANCH = "ti-u-boot-2025.01" SRCREV_uboot = "4ca322ca563a21cccad8c9ba65e386b9fd34dd16" SRC_URI += "file://0001-binman-migrate-form-pkg_resources-to-importlib.patch" + +# u-boot/lib/rsa/rsa-sign.c uses the OpenSSL engine API, but this has been +# removed from OpenSSL 4. Upstream u-boot has been fixed but we can enable +# the stub engine API in OpenSSL until this recipe is removed. +BUILD_CFLAGS += "-DOPENSSL_ENGINE_STUBS" diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2026.01.bb b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2026.01.bb index 7637cfaf..f5bddad8 100644 --- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2026.01.bb +++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2026.01.bb @@ -5,3 +5,8 @@ PR = "r0" BRANCH = "ti-u-boot-2026.01" SRCREV_uboot = "2a85f4bcffc50ddc8b443d8e4162e9e46ed0f200" + +# u-boot/lib/rsa/rsa-sign.c uses the OpenSSL engine API, but this has been +# removed from OpenSSL 4. Upstream u-boot has been fixed but we can enable +# the stub engine API in OpenSSL until this recipe is removed. +BUILD_CFLAGS += "-DOPENSSL_ENGINE_STUBS" -- 2.43.0
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#20382): https://lists.yoctoproject.org/g/meta-ti/message/20382 Mute This Topic: https://lists.yoctoproject.org/mt/121267337/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
