From c086b04b2f42427de09f009dbe9d95c935fda550 Mon Sep 17 00:00:00 2001
From: Paul Gerber <paul.gerber@ew.tq-group.com>
Date: Fri, 23 Aug 2024 11:18:30 +0200
Subject: imx-cst: update the recipe for version 3.4.0

New version of NXP i.MX Code Signing Tool for signing images for i.MX
HABv4 and AHAB.

Signed-off-by: Paul Gerber <paul.gerber@ew.tq-group.com>
(cherry picked from commit 81657e636f75015534f1b95af31a3a51552f7545)
---
 .../recipes-devtools/cst/imx-cst_3.3.1.bb          | 35 -------------------
 .../recipes-devtools/cst/imx-cst_3.4.0.bb          | 40 ++++++++++++++++++++++
 2 files changed, 40 insertions(+), 35 deletions(-)
 delete mode 100644 dynamic-layers/openembedded-layer/recipes-devtools/cst/imx-cst_3.3.1.bb
 create mode 100644 dynamic-layers/openembedded-layer/recipes-devtools/cst/imx-cst_3.4.0.bb

diff --git a/dynamic-layers/openembedded-layer/recipes-devtools/cst/imx-cst_3.3.1.bb b/dynamic-layers/openembedded-layer/recipes-devtools/cst/imx-cst_3.3.1.bb
deleted file mode 100644
index 5f808a974..000000000
--- a/dynamic-layers/openembedded-layer/recipes-devtools/cst/imx-cst_3.3.1.bb
+++ /dev/null
@@ -1,35 +0,0 @@
-SUMMARY = "i.MX code signing tool"
-DESCRIPTION = "Provides software code signing support designed that integrate the HABv4 and AHAB library"
-SECTION = "cst"
-LICENSE = "BSD-3-Clause"
-
-LIC_FILES_CHKSUM = "file://LICENSE.bsd3;md5=1fbcd66ae51447aa94da10cbf6271530"
-
-DEPENDS = "byacc-native flex-native openssl"
-
-# tag=debian/3.3.1+dfsg-2
-SRCREV = "e2c687a856e6670e753147aacef42d0a3c07891a"
-SRC_URI = " \
-    file://0001-fix-err-msg-linking.patch \
-    git://gitlab.apertis.org/pkg/imx-code-signing-tool.git;protocol=https;branch=apertis/v2022pre \
-"
-
-S = "${WORKDIR}/git"
-
-EXTRA_OEMAKE = 'CC="${CC}" LD="${CC}" AR="${AR}" OBJCOPY="${OBJCOPY}"'
-
-do_compile() {
-    cd ${S}/code/cst
-    oe_runmake build OSTYPE=linux64 ENCRYPTION=yes COPTIONS="${CFLAGS} ${CPPFLAGS}" LDOPTIONS="${LDFLAGS}"
-    cd -
-    oe_runmake -C code/hab_csf_parser COPTS="${CFLAGS} ${CPPFLAGS} ${LDFLAGS}"
-}
-
-do_install () {
-    install -d ${D}${bindir}
-    install -m 755 ${S}/code/cst/code/obj.linux64/cst ${D}${bindir}
-    install -m 755 ${S}/code/cst/code/obj.linux64/srktool ${D}${bindir}
-    install -m 755 ${S}/code/hab_csf_parser/csf_parser ${D}${bindir}
-}
-
-BBCLASSEXTEND = "native nativesdk"
diff --git a/dynamic-layers/openembedded-layer/recipes-devtools/cst/imx-cst_3.4.0.bb b/dynamic-layers/openembedded-layer/recipes-devtools/cst/imx-cst_3.4.0.bb
new file mode 100644
index 000000000..0e0ebc6ec
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-devtools/cst/imx-cst_3.4.0.bb
@@ -0,0 +1,40 @@
+SUMMARY = "i.MX code signing tool"
+DESCRIPTION = "Provides software code signing support designed that integrate the HABv4 and AHAB library"
+SECTION = "cst"
+LICENSE = "BSD-3-Clause & Apache-2.0"
+
+LIC_FILES_CHKSUM = "\
+    file://LICENSE.bsd3;md5=14aba05f9fa6c25527297c8aac95fcf6 \
+    file://LICENSE.hidapi;md5=e0ea014f523f64f0adb13409055ee59e \
+    file://LICENSE.openssl;md5=3441526b1df5cc01d812c7dfc218cea6 \
+"
+
+DEPENDS = "byacc-native flex-native openssl"
+
+# debian: 3.4.0+dfsg-2
+DEBIAN_PGK_NAME = "imx-code-signing-tool"
+DEBIAN_PGK_VERSION = "${PV}+dfsg"
+
+SRC_URI = "\
+    ${DEBIAN_MIRROR}/main/i/${DEBIAN_PGK_NAME}/${DEBIAN_PGK_NAME}_${DEBIAN_PGK_VERSION}.orig.tar.xz \
+"
+
+SRC_URI[sha256sum] = "52ee3cee3bc500a42095f73c4584e223b4b9d2dfc1cd3e5df965c5952eba8c8d"
+
+S = "${WORKDIR}/${DEBIAN_PGK_NAME}-${DEBIAN_PGK_VERSION}"
+
+EXTRA_OEMAKE = 'CC="${CC}" LD="${CC}" AR="${AR}" OBJCOPY="${OBJCOPY}"'
+
+do_compile() {
+    oe_runmake -C code/obj.linux64 OSTYPE=linux64 ENCRYPTION=yes COPTIONS="${CFLAGS} ${CPPFLAGS}" LDOPTIONS="${LDFLAGS}"
+    oe_runmake -C add-ons/hab_csf_parser COPTS="${CFLAGS} ${CPPFLAGS} ${LDFLAGS}"
+}
+
+do_install () {
+    install -d ${D}${bindir}
+    install -m 755 ${S}/code/obj.linux64/cst ${D}${bindir}/
+    install -m 755 ${S}/code/obj.linux64/srktool ${D}${bindir}
+    install -m 755 ${S}/add-ons/hab_csf_parser/csf_parser ${D}${bindir}
+}
+
+BBCLASSEXTEND = "native nativesdk"
-- 
cgit v1.2.3-54-g00ecf