From beab6c69aa785dff767afb217da08ca3c8c69204 Mon Sep 17 00:00:00 2001
From: "C.R. Guo" <chunrong.guo@nxp.com>
Date: Wed, 7 Mar 2018 16:45:47 +0800
Subject: optee-test: Rename optee-test -> optee-test-qoriq

Signed-off-by: Chunrong Guo <chunrong.guo@nxp.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 recipes-security/optee/optee-test-qoriq_git.bb | 47 ++++++++++++++++++++++++++
 recipes-security/optee/optee-test_git.bb       | 47 --------------------------
 2 files changed, 47 insertions(+), 47 deletions(-)
 create mode 100644 recipes-security/optee/optee-test-qoriq_git.bb
 delete mode 100644 recipes-security/optee/optee-test_git.bb

(limited to 'recipes-security/optee')

diff --git a/recipes-security/optee/optee-test-qoriq_git.bb b/recipes-security/optee/optee-test-qoriq_git.bb
new file mode 100644
index 000000000..e7a8921ad
--- /dev/null
+++ b/recipes-security/optee/optee-test-qoriq_git.bb
@@ -0,0 +1,47 @@
+SUMMARY = "OP-TEE sanity testsuite"
+HOMEPAGE = "https://github.com/qoriq-open-source/optee_test"
+
+LICENSE = "BSD & GPLv2"
+LIC_FILES_CHKSUM = "file://${S}/LICENSE.md;md5=daa2bcccc666345ab8940aab1315a4fa"
+
+DEPENDS = "optee-client-qoriq optee-os-qoriq python-pycrypto-native"
+
+inherit pythonnative
+
+SRC_URI = "git://github.com/qoriq-open-source/optee_test.git;nobranch=1 \
+          "
+S = "${WORKDIR}/git"
+
+SRCREV = "a54952babb83d801148867bd639a24ff6cd36f00"
+
+OPTEE_CLIENT_EXPORT = "${STAGING_DIR_HOST}${prefix}"
+TEEC_EXPORT         = "${STAGING_DIR_HOST}${prefix}"
+TA_DEV_KIT_DIR      = "${STAGING_INCDIR}/optee/export-user_ta"
+
+EXTRA_OEMAKE = " TA_DEV_KIT_DIR=${TA_DEV_KIT_DIR} \
+                 OPTEE_CLIENT_EXPORT=${OPTEE_CLIENT_EXPORT} \
+                 TEEC_EXPORT=${TEEC_EXPORT} \
+                 CROSS_COMPILE_HOST=${TARGET_PREFIX} \
+                 CROSS_COMPILE_TA=${TARGET_PREFIX} \
+                 V=1 \
+               "
+
+do_compile() {
+    # Top level makefile doesn't seem to handle parallel make gracefully
+    oe_runmake xtest
+    oe_runmake ta
+}
+
+do_install () {
+    install -D -p -m0755 ${S}/out/xtest/xtest ${D}${bindir}/xtest
+
+    # install path should match the value set in optee-client/tee-supplicant
+    # default TEEC_LOAD_PATH is /lib
+    mkdir -p ${D}/lib/optee_armtz/
+    install -D -p -m0444 ${S}/out/ta/*/*.ta ${D}/lib/optee_armtz/
+}
+
+FILES_${PN} += "/lib/optee_armtz/"
+
+# Imports machine specific configs from staging to build
+PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/recipes-security/optee/optee-test_git.bb b/recipes-security/optee/optee-test_git.bb
deleted file mode 100644
index 8aee3d2fb..000000000
--- a/recipes-security/optee/optee-test_git.bb
+++ /dev/null
@@ -1,47 +0,0 @@
-SUMMARY = "OP-TEE sanity testsuite"
-HOMEPAGE = "https://github.com/qoriq-open-source/optee_test"
-
-LICENSE = "BSD & GPLv2"
-LIC_FILES_CHKSUM = "file://${S}/LICENSE.md;md5=daa2bcccc666345ab8940aab1315a4fa"
-
-DEPENDS = "optee-client optee-os python-pycrypto-native"
-
-inherit pythonnative
-
-SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/optee_test;nobranch=1 \
-          "
-S = "${WORKDIR}/git"
-
-SRCREV = "a54952babb83d801148867bd639a24ff6cd36f00"
-
-OPTEE_CLIENT_EXPORT = "${STAGING_DIR_HOST}${prefix}"
-TEEC_EXPORT         = "${STAGING_DIR_HOST}${prefix}"
-TA_DEV_KIT_DIR      = "${STAGING_INCDIR}/optee/export-user_ta"
-
-EXTRA_OEMAKE = " TA_DEV_KIT_DIR=${TA_DEV_KIT_DIR} \
-                 OPTEE_CLIENT_EXPORT=${OPTEE_CLIENT_EXPORT} \
-                 TEEC_EXPORT=${TEEC_EXPORT} \
-                 CROSS_COMPILE_HOST=${TARGET_PREFIX} \
-                 CROSS_COMPILE_TA=${TARGET_PREFIX} \
-                 V=1 \
-               "
-
-do_compile() {
-    # Top level makefile doesn't seem to handle parallel make gracefully
-    oe_runmake xtest
-    oe_runmake ta
-}
-
-do_install () {
-    install -D -p -m0755 ${S}/out/xtest/xtest ${D}${bindir}/xtest
-
-    # install path should match the value set in optee-client/tee-supplicant
-    # default TEEC_LOAD_PATH is /lib
-    mkdir -p ${D}/lib/optee_armtz/
-    install -D -p -m0444 ${S}/out/ta/*/*.ta ${D}/lib/optee_armtz/
-}
-
-FILES_${PN} += "/lib/optee_armtz/"
-
-# Imports machine specific configs from staging to build
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-- 
cgit v1.2.3-54-g00ecf