| Message ID | 20230329154840.1827565-1-adam.johnston@arm.com |
|---|---|
| Headers | show |
| Series | arm-bsp/linux-yocto: Update N1SDP PCI quirk patch | expand |
Please ignore this specific email (should have purged my outgoing folder). 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: Wednesday, March 29, 2023 4:49 PM 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
From: Adam Johnston <adam.johnston@arm.com> Poky commit 9ef8cbcdfc85c3ce2ca52d8bee2ab6929f589383 updates the kernel to 6.1.20 which breaks the PCI quirk patch for the N1SDP. This change fixes it. Adam Johnston (1): arm-bsp/linux-yocto: Update N1SDP PCI quirk patch ...002-n1sdp-pci_quirk-add-acs-override-for-PCI-devices.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)