mirror of
https://git.yoctoproject.org/meta-arm
synced 2026-06-05 02:20:30 +00:00
arm/trusted-firmware-m: Fix local source patches application
As TF-M ships patches that it needs applied to mbedcrypto, we apply them as part of do_patch by using a postfunc. There is an issue when do_patch is executed after do_deploy_source_date_epoch_setscene and apply_local_patches tries to apply the patches already applied. To fix this, make usage of the apply_local_src_patches bbclass. Change-Id: Ia115b540b37ad3a2cce30e1e0461abd1f5a6ccc1 Signed-off-by: Diego Sueiro <diego.sueiro@arm.com> Signed-off-by: Jon Mason <jon.mason@arm.com>
This commit is contained in:
@@ -108,10 +108,9 @@ export OPENSSL_MODULES="${STAGING_LIBDIR_NATIVE}/ossl-modules"
|
||||
|
||||
# TF-M ships patches that it needs applied to mbedcrypto, so apply them
|
||||
# as part of do_patch.
|
||||
apply_local_patches() {
|
||||
cat ${S}/lib/ext/mbedcrypto/*.patch | patch -p1 -d ${S}/../mbedtls
|
||||
}
|
||||
do_patch[postfuncs] += "apply_local_patches"
|
||||
LOCAL_SRC_PATCHES_INPUT_DIR = "${S}/lib/ext/mbedcrypto"
|
||||
LOCAL_SRC_PATCHES_DEST_DIR = "${S}/../mbedtls"
|
||||
inherit apply_local_src_patches
|
||||
|
||||
do_configure[cleandirs] = "${B}"
|
||||
do_configure() {
|
||||
|
||||
Reference in New Issue
Block a user