From f21b1fee8b324d6dd9ce826f3f084933824462a5 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Mon, 2 Oct 2023 12:36:44 -0500 Subject: libcamera: Avoid build break in signature recalculation The signature recalculation task can fail: ``` /.../build/tmp/work/armv8a-poky-linux/libcamera/1_0.0.4-r0/temp/run.do_recalculate_ipa_signatures_package.937421: line 154: /.../build/tmp/work/armv8a-poky-linux/libcamera/1_0.0.4-r0/git/src/ipa/ipa-sign-install.sh: No such file or directory ``` This happens whenever ${S} is removed and packages are retrieved from sstate cache. Instead of trying to fix the task, avoid the issue altogether by performing the signature recalculation directly in do_package. Signed-off-by: Tom Hochstein Acked-by: Kieran Bingham Signed-off-by: Khem Raj (cherry picked from commit fe3a2def8838b734ba7f3fbe88172fedce721e75) Signed-off-by: Armin Kuster --- meta-multimedia/recipes-multimedia/libcamera/libcamera_0.1.0.bb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/meta-multimedia/recipes-multimedia/libcamera/libcamera_0.1.0.bb b/meta-multimedia/recipes-multimedia/libcamera/libcamera_0.1.0.bb index ece1be6f32..2a3c6473ee 100644 --- a/meta-multimedia/recipes-multimedia/libcamera/libcamera_0.1.0.bb +++ b/meta-multimedia/recipes-multimedia/libcamera/libcamera_0.1.0.bb @@ -50,8 +50,11 @@ do_install:append() { chrpath -d ${D}${libexecdir}/libcamera/v4l2-compat.so } -addtask do_recalculate_ipa_signatures_package after do_package before do_packagedata -do_recalculate_ipa_signatures_package() { +do_package:append() { + bb.build.exec_func("do_package_recalculate_ipa_signatures", d) +} + +do_package_recalculate_ipa_signatures() { local modules for module in $(find ${PKGD}/usr/lib/libcamera -name "*.so.sign"); do module="${module%.sign}" -- cgit v1.2.3-54-g00ecf