Skip to content

Commit 29e6dea

Browse files
minkipc: pack TA in its own package (#1925)
Packing the TA are failing on armv7 as the prebuild arch did not match. Adding a new package where the arch was skiped for testing solves the problem. Fixes the following package QA Issue: ``` ERROR: minkipc-1.2.4-r0 do_package_qa: QA Issue: Architecture did not match (AArch64, expected ARM) in /usr/lib/qtee-tas/qcs8300/FD02C9DA-306C-48C7-A49C-BBD827AE86EE.mbn [arch] ERROR: minkipc-1.2.4-r0 do_package_qa: QA Issue: Bit size did not match (64, expected 32) in /usr/lib/qtee-tas/qcs8300/FD02C9DA-306C-48C7-A49C-BBD827AE86EE.mbn [arch] ```
2 parents 5d1eabf + 206d663 commit 29e6dea

1 file changed

Lines changed: 11 additions & 9 deletions

File tree

dynamic-layers/openembedded-layer/recipes-security/minkipc/minkipc_1.2.4.bb

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -41,17 +41,11 @@ EXTRA_OECMAKE = " \
4141

4242
PACKAGE_BEFORE_PN += "${PN}-qteesupplicant"
4343

44+
PACKAGES += "${PN}-ta"
45+
4446
SYSTEMD_PACKAGES = "${PN}-qteesupplicant"
4547
SYSTEMD_SERVICE:${PN}-qteesupplicant = "qteesupplicant.service sfsconfig.service"
4648

47-
FILES:${PN}-qteesupplicant = "${bindir}/qtee_supplicant \
48-
${nonarch_libdir}/udev/rules.d/99-qcomtee-udev.rules \
49-
${base_bindir}/sfs_config \
50-
"
51-
52-
RDEPENDS:${PN}-qteesupplicant = "${PN}"
53-
RRECOMMENDS:${PN}-qteesupplicant = "mount-tee-partition"
54-
5549
do_install:append() {
5650
mkdir -p ${D}${nonarch_base_libdir}/qtee-tas
5751
cp -R ${S}/ta/* ${D}${nonarch_base_libdir}/qtee-tas/
@@ -60,5 +54,13 @@ do_install:append() {
6054
rm ${D}${nonarch_base_libdir}/qtee-tas/NO.LOGIN.BINARY.LICENSE.QTI.pdf
6155
}
6256

63-
FILES:${PN} += "${nonarch_base_libdir}/qtee-tas"
57+
FILES:${PN}-ta += "${nonarch_base_libdir}/qtee-tas"
58+
RDEPENDS:${PN} = "${PN}-ta"
59+
INSANE_SKIP:${PN}-ta += "arch"
6460

61+
FILES:${PN}-qteesupplicant = "${bindir}/qtee_supplicant \
62+
${nonarch_libdir}/udev/rules.d/99-qcomtee-udev.rules \
63+
${base_bindir}/sfs_config \
64+
"
65+
RDEPENDS:${PN}-qteesupplicant = "${PN}"
66+
RRECOMMENDS:${PN}-qteesupplicant = "mount-tee-partition"

0 commit comments

Comments
 (0)