From: Chunrong Guo <[email protected]> *Include the following changes: 24d3133 - SOBJ_ENG_APP: Initialising uninitialised variables f979dc4 - SOBJ_APP: Adding option for creating fake pem file while importing object 2adc118 - APP: Miscellaneous changes 10f5c67 - APP: Resolving coverity issues 18d4422 - SEC_OBJ_ENG: Adding check if multiple objects are created with same index 9e21913 - Commit Update: SOBJ_APP:Adding option to save fake pem file
*Update COMPATIBLE_MACHINE for ls1012a *Add ARCH for install path *Fix install path issue. *Add INSANE_SKIP for dev-elf,ldflags and dev-deps to fix QA Issue. Signed-off-by: Chunrong Guo <[email protected]> --- recipes-extended/secure-obj/secure-obj.inc | 4 ++-- recipes-extended/secure-obj/secure-obj_git.bb | 21 +++++++++++++-------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/recipes-extended/secure-obj/secure-obj.inc b/recipes-extended/secure-obj/secure-obj.inc index 3fd70eb..3fc5b89 100644 --- a/recipes-extended/secure-obj/secure-obj.inc +++ b/recipes-extended/secure-obj/secure-obj.inc @@ -12,7 +12,7 @@ LDFLAGS += "${TOOLCHAIN_OPTIONS}" SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/secure_obj;nobranch=1 \ " -SRCREV = "74befe01bda41f1c27b197ef2ab66e475e9a81b3" +SRCREV = "24d31333bd50f212ac692db83a4a2d88d0dadb52" WRAP_TARGET_PREFIX ?= "${TARGET_PREFIX}" export SECURE_STORAGE_PATH = "${S}/secure_storage_ta/ta/" @@ -24,4 +24,4 @@ ALLOW_EMPTY_${PN} = "1" INHIBIT_PACKAGE_STRIP = "1" PARALLEL_MAKE = "" INSANE_SKIP_${PN} = "ldflags" -COMPATIBLE_MACHINE = "(ls2080ardb|ls2084ardb|ls2088a|ls1043a|ls1046a|ls1088a)" +COMPATIBLE_MACHINE = "(ls2080ardb|ls2084ardb|ls2088a|ls1043a|ls1046a|ls1088a|ls1012a)" diff --git a/recipes-extended/secure-obj/secure-obj_git.bb b/recipes-extended/secure-obj/secure-obj_git.bb index 103c089..db881b1 100644 --- a/recipes-extended/secure-obj/secure-obj_git.bb +++ b/recipes-extended/secure-obj/secure-obj_git.bb @@ -9,6 +9,8 @@ export SECURE_STORAGE_PATH = "${S}/secure_storage_ta/ta/" export OPTEE_CLIENT_EXPORT = "${RECIPE_SYSROOT}/usr" export CROSS_COMPILE_HOST = "${CROSS_COMPILE}" export CROSS_COMPILE_TA = "${CROSS_COMPILE}" +ARCH_qoriq-arm64 = "aarch64" +ARCH_qoriq-arm = "arm" do_compile() { unset LDFLAGS @@ -23,15 +25,18 @@ do_compile() { } do_install() { - install -d ${D}${bindir}/secure_obj - install -d ${D}${libdir}/secure_obj + install -d ${D}${bindir} install -d ${D}${includedir} - cp ${S}/secure_storage_ta/ta/b05bcf48-9732-4efa-a9e0-141c7c888c34.ta ${D}${bindir}/secure_obj - cp ${S}/securekey_lib/out/export/lib/libsecure_obj.so ${D}${libdir}/secure_obj - cp ${S}/secure_obj-openssl-engine/libeng_secure_obj.so ${D}${libdir}/secure_obj - cp ${S}/securekey_lib/out/export/app/* ${D}${bindir}/secure_obj + install -d ${D}${base_libdir}/optee_armtz + install -d ${D}${libdir}/${ARCH}-linux-gnu/openssl-1.0.0/engines + cp ${S}/secure_storage_ta/ta/b05bcf48-9732-4efa-a9e0-141c7c888c34.ta ${D}${base_libdir}/optee_armtz + cp ${S}/securekey_lib/out/export/lib/libsecure_obj.so ${D}${libdir} + cp ${S}/secure_obj-openssl-engine/libeng_secure_obj.so ${D}${libdir}/${ARCH}-linux-gnu/openssl-1.0.0/engines + cp ${S}/securekey_lib/out/export/app/* ${D}${bindir} + cp ${S}/secure_obj-openssl-engine/app/sobj_eng_app ${D}${bindir} cp ${S}/securekey_lib/out/export/include/* ${D}${includedir} - cp ${S}/secure_obj-openssl-engine/app/sobj_eng_app ${D}${bindir}/secure_obj } -FILES_${PN} += "${libdir}/secure_obj" +FILES_${PN} += "${base_libdir}/optee_armtz ${libdir}/${ARCH}-linux-gnu/openssl-1.0.0/engines" +INSANE_SKIP_${PN} = "dev-deps ldflags" +INSANE_SKIP_${PN}-dev = "ldflags dev-elf" -- 2.7.4 -- _______________________________________________ meta-freescale mailing list [email protected] https://lists.yoctoproject.org/listinfo/meta-freescale
