From f3c7f91d90f2d23f2f9684022d40ab9ba923a936 Mon Sep 17 00:00:00 2001
From: Jose Diaz de Grenu <Jose.DiazdeGrenu@digi.com>
Date: Wed, 24 Jan 2018 19:29:02 +0100
Subject: [PATCH] trustfence-cst: include in SDK

Generate and include the host tools in the SDK when Trustfence is enabled.
This makes it easier to use the standalone signing and encrypting scripts.

Signed-off-by: Jose Diaz de Grenu <Jose.DiazdeGrenu@digi.com>
---
 .../trustfence-cst/trustfence-cst-native_2.3.2.bb        | 3 ---
 .../trustfence-cst/trustfence-cst-native_2.3.3.bb        | 5 -----
 .../{trustfence-cst-native.inc => trustfence-cst.inc}    | 9 +++++----
 .../recipes-bsp/trustfence-cst/trustfence-cst_2.3.2.bb   | 3 +++
 .../recipes-bsp/trustfence-cst/trustfence-cst_2.3.3.bb   | 5 +++++
 .../nativesdk-packagegroup-sdk-host.bbappend             | 2 +-
 6 files changed, 14 insertions(+), 13 deletions(-)
 delete mode 100644 meta-digi-arm/recipes-bsp/trustfence-cst/trustfence-cst-native_2.3.2.bb
 delete mode 100644 meta-digi-arm/recipes-bsp/trustfence-cst/trustfence-cst-native_2.3.3.bb
 rename meta-digi-arm/recipes-bsp/trustfence-cst/{trustfence-cst-native.inc => trustfence-cst.inc} (93%)
 create mode 100644 meta-digi-arm/recipes-bsp/trustfence-cst/trustfence-cst_2.3.2.bb
 create mode 100644 meta-digi-arm/recipes-bsp/trustfence-cst/trustfence-cst_2.3.3.bb

diff --git a/meta-digi-arm/recipes-bsp/trustfence-cst/trustfence-cst-native_2.3.2.bb b/meta-digi-arm/recipes-bsp/trustfence-cst/trustfence-cst-native_2.3.2.bb
deleted file mode 100644
index b3ec2f2de..000000000
--- a/meta-digi-arm/recipes-bsp/trustfence-cst/trustfence-cst-native_2.3.2.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-# Copyright (C) 2017 Digi International
-
-require trustfence-cst-native.inc
diff --git a/meta-digi-arm/recipes-bsp/trustfence-cst/trustfence-cst-native_2.3.3.bb b/meta-digi-arm/recipes-bsp/trustfence-cst/trustfence-cst-native_2.3.3.bb
deleted file mode 100644
index dc6e8bbd5..000000000
--- a/meta-digi-arm/recipes-bsp/trustfence-cst/trustfence-cst-native_2.3.3.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright (C) 2017 Digi International
-
-require trustfence-cst-native.inc
-
-INSANE_SKIP_${PN} += "already-stripped"
diff --git a/meta-digi-arm/recipes-bsp/trustfence-cst/trustfence-cst-native.inc b/meta-digi-arm/recipes-bsp/trustfence-cst/trustfence-cst.inc
similarity index 93%
rename from meta-digi-arm/recipes-bsp/trustfence-cst/trustfence-cst-native.inc
rename to meta-digi-arm/recipes-bsp/trustfence-cst/trustfence-cst.inc
index dd11a8fd4..5484fef11 100644
--- a/meta-digi-arm/recipes-bsp/trustfence-cst/trustfence-cst-native.inc
+++ b/meta-digi-arm/recipes-bsp/trustfence-cst/trustfence-cst.inc
@@ -1,11 +1,11 @@
-# Copyright (C) 2017 Digi International
+# Copyright (C) 2017, 2018 Digi International
 SUMMARY = "NXP Code signing Tool for the High Assurance Boot library"
 DESCRIPTION = "Provides software code signing support designed for use with \
 i.MX processors that integrate the HAB library in the internal boot ROM."
 HOMEPAGE = "https://www.nxp.com/webapp/Download?colCode=IMX_CST_TOOL"
 LICENSE = "CLOSED"
 
-DEPENDS = "openssl-native"
+DEPENDS = "openssl"
 
 SRC_URI = " \
     ${@base_conditional('TRUSTFENCE_SIGN', '1', 'file://cst-${PV}.tar.gz', '', d)} \
@@ -29,8 +29,6 @@ python() {
 
 S = "${WORKDIR}/cst-${PV}"
 
-inherit native
-
 do_configure() {
 	cp -f ${WORKDIR}/Makefile .
 }
@@ -48,3 +46,6 @@ do_install() {
 	install -m 0755 ca/v3_ca.cnf ${D}${bindir}/v3_ca.cnf
 	install -m 0755 ca/v3_usr.cnf ${D}${bindir}/v3_usr.cnf
 }
+
+FILES_${PN} = "${bindir}"
+BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-digi-arm/recipes-bsp/trustfence-cst/trustfence-cst_2.3.2.bb b/meta-digi-arm/recipes-bsp/trustfence-cst/trustfence-cst_2.3.2.bb
new file mode 100644
index 000000000..ef988e311
--- /dev/null
+++ b/meta-digi-arm/recipes-bsp/trustfence-cst/trustfence-cst_2.3.2.bb
@@ -0,0 +1,3 @@
+# Copyright (C) 2017, 2018 Digi International
+
+require trustfence-cst.inc
diff --git a/meta-digi-arm/recipes-bsp/trustfence-cst/trustfence-cst_2.3.3.bb b/meta-digi-arm/recipes-bsp/trustfence-cst/trustfence-cst_2.3.3.bb
new file mode 100644
index 000000000..7c93d240f
--- /dev/null
+++ b/meta-digi-arm/recipes-bsp/trustfence-cst/trustfence-cst_2.3.3.bb
@@ -0,0 +1,5 @@
+# Copyright (C) 2017, 2018 Digi International
+
+require trustfence-cst.inc
+
+INSANE_SKIP_${PN} += "already-stripped"
diff --git a/meta-digi-arm/recipes-core/packagegroup/nativesdk-packagegroup-sdk-host.bbappend b/meta-digi-arm/recipes-core/packagegroup/nativesdk-packagegroup-sdk-host.bbappend
index 77b7c7a3e..ee641d902 100644
--- a/meta-digi-arm/recipes-core/packagegroup/nativesdk-packagegroup-sdk-host.bbappend
+++ b/meta-digi-arm/recipes-core/packagegroup/nativesdk-packagegroup-sdk-host.bbappend
@@ -1,5 +1,5 @@
 # Copyright (C) 2016 Digi International.
 
 RDEPENDS_${PN} += " \
-    ${@base_conditional('TRUSTFENCE_SIGN', '1', 'nativesdk-trustfence-sign-tools', '', d)} \
+    ${@base_conditional('TRUSTFENCE_SIGN', '1', 'nativesdk-trustfence-sign-tools nativesdk-trustfence-cst', '', d)} \
 "