From 153048c2a75bdbad95e27bd9d0faf7949c25a16e Mon Sep 17 00:00:00 2001
From: Javier Viguera <javier.viguera@digi.com>
Date: Tue, 5 Jul 2022 17:30:40 +0200
Subject: [PATCH] trustfence-cst: restrict package to native/nativesdk

The recipe fails to build for the target, but that is expected, as this
is a tool you need to run in the host or from the toolchain/SDK, so
rework the recipes to restrict only for native and nativesdk.

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
---
 .../nativesdk-trustfence-cst_3.3.1.bb               |  5 +++++
 ...tfence-cst_3.3.1.bb => trustfence-cst-3.3.1.inc} | 13 +++----------
 .../trustfence-cst/trustfence-cst-native_3.3.1.bb   |  5 +++++
 3 files changed, 13 insertions(+), 10 deletions(-)
 create mode 100644 meta-digi-arm/recipes-bsp/trustfence-cst/nativesdk-trustfence-cst_3.3.1.bb
 rename meta-digi-arm/recipes-bsp/trustfence-cst/{trustfence-cst_3.3.1.bb => trustfence-cst-3.3.1.inc} (82%)
 create mode 100644 meta-digi-arm/recipes-bsp/trustfence-cst/trustfence-cst-native_3.3.1.bb

diff --git a/meta-digi-arm/recipes-bsp/trustfence-cst/nativesdk-trustfence-cst_3.3.1.bb b/meta-digi-arm/recipes-bsp/trustfence-cst/nativesdk-trustfence-cst_3.3.1.bb
new file mode 100644
index 000000000..391c28e25
--- /dev/null
+++ b/meta-digi-arm/recipes-bsp/trustfence-cst/nativesdk-trustfence-cst_3.3.1.bb
@@ -0,0 +1,5 @@
+# Copyright (C) 2022 Digi International.
+
+require trustfence-cst-${PV}.inc
+
+inherit nativesdk
diff --git a/meta-digi-arm/recipes-bsp/trustfence-cst/trustfence-cst_3.3.1.bb b/meta-digi-arm/recipes-bsp/trustfence-cst/trustfence-cst-3.3.1.inc
similarity index 82%
rename from meta-digi-arm/recipes-bsp/trustfence-cst/trustfence-cst_3.3.1.bb
rename to meta-digi-arm/recipes-bsp/trustfence-cst/trustfence-cst-3.3.1.inc
index 3ee692daf..5ae179f89 100644
--- a/meta-digi-arm/recipes-bsp/trustfence-cst/trustfence-cst_3.3.1.bb
+++ b/meta-digi-arm/recipes-bsp/trustfence-cst/trustfence-cst-3.3.1.inc
@@ -1,4 +1,5 @@
-# Copyright (C) 2017-2020 Digi International
+# Copyright (C) 2017-2022 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."
@@ -6,14 +7,7 @@ HOMEPAGE = "https://www.nxp.com/webapp/Download?colCode=IMX_CST_TOOL"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE.bsd3;md5=1fbcd66ae51447aa94da10cbf6271530"
 
-DEPENDS = "byacc flex"
-
-# Explicitly add byacc-native as a dependency when building the package for the
-# SDK, otherwise, it won't get installed in the sysroot, causing a compilation
-# error.
-# Explicitly add openssl-native for the SDK build to correctly link to the
-# openssl libraries in the native dependencies folder.
-DEPENDS:append:class-nativesdk = " byacc-native"
+DEPENDS = "byacc-native flex-native"
 
 SRC_URI = " \
     ${DIGI_PKG_SRC}/cst-${PV}.tgz;name=cst \
@@ -57,4 +51,3 @@ do_install() {
 }
 
 FILES:${PN} = "${bindir}"
-BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-digi-arm/recipes-bsp/trustfence-cst/trustfence-cst-native_3.3.1.bb b/meta-digi-arm/recipes-bsp/trustfence-cst/trustfence-cst-native_3.3.1.bb
new file mode 100644
index 000000000..5574a8987
--- /dev/null
+++ b/meta-digi-arm/recipes-bsp/trustfence-cst/trustfence-cst-native_3.3.1.bb
@@ -0,0 +1,5 @@
+# Copyright (C) 2022 Digi International.
+
+require trustfence-cst-${PV}.inc
+
+inherit native