pings ________________________________ From: Chunrong Guo <chunrong....@nxp.com> Sent: Wednesday, March 7, 2018 4:45:45 PM To: meta-freescale@yoctoproject.org Cc: Zhenhua Luo; C.r. Guo Subject: [PATCH 1/3] optee-os: Rename optee-os -> optee-os-qoriq
Signed-off-by: Chunrong Guo <chunrong....@nxp.com> --- ...1-allow-setting-sysroot-for-libgcc-lookup.patch | 13 +++++ recipes-security/optee/optee-os-qoriq_git.bb | 67 ++++++++++++++++++++++ ...1-allow-setting-sysroot-for-libgcc-lookup.patch | 13 ----- recipes-security/optee/optee-os_git.bb | 67 ---------------------- 4 files changed, 80 insertions(+), 80 deletions(-) create mode 100644 recipes-security/optee/optee-os-qoriq/0001-allow-setting-sysroot-for-libgcc-lookup.patch create mode 100644 recipes-security/optee/optee-os-qoriq_git.bb delete mode 100644 recipes-security/optee/optee-os/0001-allow-setting-sysroot-for-libgcc-lookup.patch delete mode 100644 recipes-security/optee/optee-os_git.bb diff --git a/recipes-security/optee/optee-os-qoriq/0001-allow-setting-sysroot-for-libgcc-lookup.patch b/recipes-security/optee/optee-os-qoriq/0001-allow-setting-sysroot-for-libgcc-lookup.patch new file mode 100644 index 0000000..17127d0 --- /dev/null +++ b/recipes-security/optee/optee-os-qoriq/0001-allow-setting-sysroot-for-libgcc-lookup.patch @@ -0,0 +1,13 @@ +diff --git a/mk/gcc.mk b/mk/gcc.mk +index fc38c4d..77b8d74 100644 +--- a/mk/gcc.mk ++++ b/mk/gcc.mk +@@ -12,7 +12,7 @@ nostdinc$(sm) := -nostdinc -isystem $(shell $(CC$(sm)) \ + -print-file-name=include 2> /dev/null) + + # Get location of libgcc from gcc +-libgcc$(sm) := $(shell $(CC$(sm)) $(CFLAGS$(arch-bits-$(sm))) $(comp-cflags$(sm)) \ ++libgcc$(sm) := $(shell $(CC$(sm)) $(LIBGCC_LOCATE_CFLAGS) $(CFLAGS$(arch-bits-$(sm))) $(comp-cflags$(sm)) \ + -print-libgcc-file-name 2> /dev/null) + + # Define these to something to discover accidental use diff --git a/recipes-security/optee/optee-os-qoriq_git.bb b/recipes-security/optee/optee-os-qoriq_git.bb new file mode 100644 index 0000000..21b467e --- /dev/null +++ b/recipes-security/optee/optee-os-qoriq_git.bb @@ -0,0 +1,67 @@ +SUMMARY = "OP-TEE Trusted OS" +DESCRIPTION = "OPTEE OS" + +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=69663ab153298557a59c67a60a743e5b" + +DEPENDS = "python-pycrypto-native" + +inherit deploy pythonnative + +SRCREV = "4886ddbd44665589215df4ef010958cba55dc8ba" +SRC_URI = "git://bitbucket.sw.nxp.com/scm/dash/optee_os.git;nobranch=1 \ + file://0001-allow-setting-sysroot-for-libgcc-lookup.patch \ + " + +S = "${WORKDIR}/git" + +OPTEEMACHINE ?= "${MACHINE}" + +EXTRA_OEMAKE = "PLATFORM=ls-${OPTEEMACHINE} CFG_ARM64_core=y \ + ARCH=arm \ + CROSS_COMPILE_core=${HOST_PREFIX} \ + CROSS_COMPILE_ta_arm64=${HOST_PREFIX} \ + NOWERROR=1 \ + LDFLAGS= \ + LIBGCC_LOCATE_CFLAGS=--sysroot=${STAGING_DIR_HOST} \ + " + +OPTEE_ARCH_armv7a = "arm32" +OPTEE_ARCH_aarch64 = "arm64" + +do_compile() { + unset LDFLAGS + oe_runmake all CFG_TEE_TA_LOG_LEVEL=0 +} + +do_install() { + #install core on boot directory + install -d ${D}/lib/firmware/ + + install -m 644 ${B}/out/arm-plat-ls/core/tee.elf ${D}/lib/firmware/tee_${MACHINE}.bin + #install TA devkit + install -d ${D}/usr/include/optee/export-user_ta/ + + for f in ${B}/out/arm-plat-ls/export-ta_${OPTEE_ARCH}/* ; do + cp -aR $f ${D}/usr/include/optee/export-user_ta/ + done +} + +PACKAGE_ARCH = "${MACHINE_ARCH}" + +do_deploy() { + install -d ${DEPLOYDIR}/optee + for f in ${D}/lib/firmware/*; do + install -m 644 $f ${DEPLOYDIR}/optee/tee_${MACHINE}.bin + done +} + +addtask deploy before do_build after do_install + +FILES_${PN} = "/lib/firmware/" +FILES_${PN}-dev = "/usr/include/optee" + +INSANE_SKIP_${PN}-dev = "staticdev" + +INHIBIT_PACKAGE_STRIP = "1" +COMPATIBLE_MACHINE = "(ls1043ardb|ls1046ardb|ls1012ardb)" diff --git a/recipes-security/optee/optee-os/0001-allow-setting-sysroot-for-libgcc-lookup.patch b/recipes-security/optee/optee-os/0001-allow-setting-sysroot-for-libgcc-lookup.patch deleted file mode 100644 index 17127d0..0000000 --- a/recipes-security/optee/optee-os/0001-allow-setting-sysroot-for-libgcc-lookup.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/mk/gcc.mk b/mk/gcc.mk -index fc38c4d..77b8d74 100644 ---- a/mk/gcc.mk -+++ b/mk/gcc.mk -@@ -12,7 +12,7 @@ nostdinc$(sm) := -nostdinc -isystem $(shell $(CC$(sm)) \ - -print-file-name=include 2> /dev/null) - - # Get location of libgcc from gcc --libgcc$(sm) := $(shell $(CC$(sm)) $(CFLAGS$(arch-bits-$(sm))) $(comp-cflags$(sm)) \ -+libgcc$(sm) := $(shell $(CC$(sm)) $(LIBGCC_LOCATE_CFLAGS) $(CFLAGS$(arch-bits-$(sm))) $(comp-cflags$(sm)) \ - -print-libgcc-file-name 2> /dev/null) - - # Define these to something to discover accidental use diff --git a/recipes-security/optee/optee-os_git.bb b/recipes-security/optee/optee-os_git.bb deleted file mode 100644 index 8151d42..0000000 --- a/recipes-security/optee/optee-os_git.bb +++ /dev/null @@ -1,67 +0,0 @@ -SUMMARY = "OP-TEE Trusted OS" -DESCRIPTION = "OPTEE OS" - -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=69663ab153298557a59c67a60a743e5b" - -DEPENDS = "python-pycrypto-native" - -inherit deploy pythonnative - -SRCREV = "ced7d32072c2b350c2090803f6dcfa006057efda" -SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/optee_os;nobranch=1 \ - file://0001-allow-setting-sysroot-for-libgcc-lookup.patch \ - " - -S = "${WORKDIR}/git" - -OPTEEMACHINE ?= "${MACHINE}" - -EXTRA_OEMAKE = "PLATFORM=ls-${OPTEEMACHINE} CFG_ARM64_core=y \ - CROSS_COMPILE_core=${HOST_PREFIX} \ - CROSS_COMPILE_ta_arm64=${HOST_PREFIX} \ - NOWERROR=1 \ - ta-targets=ta_arm64 \ - LDFLAGS= \ - LIBGCC_LOCATE_CFLAGS=--sysroot=${STAGING_DIR_HOST} \ - " - -OPTEE_ARCH_armv7a = "arm32" -OPTEE_ARCH_aarch64 = "arm64" - -do_compile() { - unset LDFLAGS - oe_runmake all CFG_TEE_TA_LOG_LEVEL=0 -} - -do_install() { - #install core on boot directory - install -d ${D}/lib/firmware/ - - install -m 644 ${B}/out/arm-plat-ls/core/tee.elf ${D}/lib/firmware/tee_${MACHINE}.bin - #install TA devkit - install -d ${D}/usr/include/optee/export-user_ta/ - - for f in ${B}/out/arm-plat-ls/export-ta_${OPTEE_ARCH}/* ; do - cp -aR $f ${D}/usr/include/optee/export-user_ta/ - done -} - -PACKAGE_ARCH = "${MACHINE_ARCH}" - -do_deploy() { - install -d ${DEPLOYDIR}/optee - for f in ${D}/lib/firmware/*; do - install -m 644 $f ${DEPLOYDIR}/optee/tee_${MACHINE}.bin - done -} - -addtask deploy before do_build after do_install - -FILES_${PN} = "/lib/firmware/" -FILES_${PN}-dev = "/usr/include/optee" - -INSANE_SKIP_${PN}-dev = "staticdev" - -INHIBIT_PACKAGE_STRIP = "1" -COMPATIBLE_MACHINE = "(ls1043ardb|ls1046ardb|ls1012ardb)" -- 1.9.0
-- _______________________________________________ meta-freescale mailing list meta-freescale@yoctoproject.org https://lists.yoctoproject.org/listinfo/meta-freescale