| Message ID | 20221216175508.3149543-1-adam.johnston@arm.com |
|---|---|
| Headers | show |
| Series | arm/trusted-services: Fix 'no such file' when building libts | expand |
On Fri, 16 Dec 2022 17:55:07 +0000, adam.johnston@arm.com wrote: > The libts recipe assumes generated cmake file will be suffixed with > '-noconfig'. This is only true when building with the default type > i.e. "". > > Check which target cmake file has been generated before trying to > patch it. This fixes 'no such file' error when building with an > explicit type (Debug, Release, etc). > > [...] Applied, thanks! [1/1] arm/trusted-services: Fix 'no such file' when building libts commit: 74f0ce702870b95cff0686873c7f5eed6bcd015c Best regards,
On Fri, 16 Dec 2022 17:55:07 +0000, adam.johnston@arm.com wrote: > The libts recipe assumes generated cmake file will be suffixed with > '-noconfig'. This is only true when building with the default type > i.e. "". > > Check which target cmake file has been generated before trying to > patch it. This fixes 'no such file' error when building with an > explicit type (Debug, Release, etc). > > [...] Applied, thanks! [1/1] arm/trusted-services: Fix 'no such file' when building libts commit: 74f0ce702870b95cff0686873c7f5eed6bcd015c Best regards,
Can we please backport this patch to langdale? Thanks and Regards Adam -----Original Message----- From: meta-arm@lists.yoctoproject.org <meta-arm@lists.yoctoproject.org> On Behalf Of Adam Johnston via lists.yoctoproject.org Sent: 16 December 2022 17:55 To: meta-arm@lists.yoctoproject.org; Ross Burton <Ross.Burton@arm.com> Cc: nd <nd@arm.com>; Adam Johnston <Adam.Johnston@arm.com> Subject: [meta-arm] [PATCH 1/1] arm/trusted-services: Fix 'no such file' when building libts From: Adam Johnston <adam.johnston@arm.com> The libts recipe assumes generated cmake file will be suffixed with '-noconfig'. This is only true when building with the default type i.e. "". Check which target cmake file has been generated before trying to patch it. This fixes 'no such file' error when building with an explicit type (Debug, Release, etc). Signed-off-by: Adam Johnston <adam.johnston@arm.com> --- meta-arm/recipes-security/trusted-services/libts_git.bb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/meta-arm/recipes-security/trusted-services/libts_git.bb b/meta-arm/recipes-security/trusted-services/libts_git.bb index 598b281b..aafe8516 100644 --- a/meta-arm/recipes-security/trusted-services/libts_git.bb +++ b/meta-arm/recipes-security/trusted-services/libts_git.bb @@ -24,11 +24,14 @@ do_install:append () { fi # Move the dynamic libraries into the standard place. - # Update a cmake file to use correct paths. install -d ${D}${libdir} mv ${D}${TS_INSTALL}/lib/libts* ${D}${libdir} - sed -i -e "s#/${TS_ENV}##g" ${D}${TS_INSTALL}/lib/cmake/libts/libtsTargets-noconfig.cmake + # Update generated cmake file to use correct paths. + target_cmake=$(find ${D}${TS_INSTALL}/lib/cmake/libts -type f -iname "libtsTargets-*.cmake") + if [ ! -z "$target_cmake" ]; then + sed -i -e "s#/${TS_ENV}##g" $target_cmake + fi } inherit ${@oe.utils.conditional('VIRTUAL-RUNTIME_dev_manager', 'busybox-mdev', '', 'useradd', d)} -- 2.38.1
On Fri, 16 Dec 2022 17:55:07 +0000, adam.johnston@arm.com wrote: > The libts recipe assumes generated cmake file will be suffixed with > '-noconfig'. This is only true when building with the default type > i.e. "". > > Check which target cmake file has been generated before trying to > patch it. This fixes 'no such file' error when building with an > explicit type (Debug, Release, etc). > > [...] Applied, thanks! [1/1] arm/trusted-services: Fix 'no such file' when building libts commit: 13c7463c9fe948ec62e3b7824a7d5a882124f500 Best regards,
On Fri, 16 Dec 2022 17:55:07 +0000, adam.johnston@arm.com wrote: > The libts recipe assumes generated cmake file will be suffixed with > '-noconfig'. This is only true when building with the default type > i.e. "". > > Check which target cmake file has been generated before trying to > patch it. This fixes 'no such file' error when building with an > explicit type (Debug, Release, etc). > > [...] Applied, thanks! [1/1] arm/trusted-services: Fix 'no such file' when building libts commit: 13c7463c9fe948ec62e3b7824a7d5a882124f500 Best regards,
From: Adam Johnston <adam.johnston@arm.com> The libts recipe assumes generated cmake file will be suffixed with '-noconfig'. This is only true when building with the default type i.e. "". Check which target cmake file has been generated before trying to patch it. This fixes 'no such file' error when building with an explicit type (Debug, Release, etc). Adam Johnston (1): arm/trusted-services: Fix 'no such file' when building libts meta-arm/recipes-security/trusted-services/libts_git.bb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)