summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Hochstein <tom.hochstein@nxp.com>2023-10-02 12:36:44 -0500
committerArmin Kuster <akuster808@gmail.com>2023-10-12 09:58:05 -0400
commitf21b1fee8b324d6dd9ce826f3f084933824462a5 (patch)
tree9e37e6216d5343567d97f168c5eadad29cfc533b
parent278c3f75e32f38f71bb52d161fe06bcb6f6bdd2f (diff)
downloadmeta-openembedded-f21b1fee8b324d6dd9ce826f3f084933824462a5.tar.gz
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 <tom.hochstein@nxp.com> Acked-by: Kieran Bingham <kieran.bingham@ideasonboard.com> Signed-off-by: Khem Raj <raj.khem@gmail.com> (cherry picked from commit fe3a2def8838b734ba7f3fbe88172fedce721e75) Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--meta-multimedia/recipes-multimedia/libcamera/libcamera_0.1.0.bb7
1 files 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() {
50 chrpath -d ${D}${libexecdir}/libcamera/v4l2-compat.so 50 chrpath -d ${D}${libexecdir}/libcamera/v4l2-compat.so
51} 51}
52 52
53addtask do_recalculate_ipa_signatures_package after do_package before do_packagedata 53do_package:append() {
54do_recalculate_ipa_signatures_package() { 54 bb.build.exec_func("do_package_recalculate_ipa_signatures", d)
55}
56
57do_package_recalculate_ipa_signatures() {
55 local modules 58 local modules
56 for module in $(find ${PKGD}/usr/lib/libcamera -name "*.so.sign"); do 59 for module in $(find ${PKGD}/usr/lib/libcamera -name "*.so.sign"); do
57 module="${module%.sign}" 60 module="${module%.sign}"