From f8c8e716932a2a0e2b1ea0041f5d19f65aac3541 Mon Sep 17 00:00:00 2001
From: Kimmo Vaisanen <kimmo.vaisanen@arm.com>
Date: Thu, 15 Apr 2021 11:13:30 +0300
Subject: [PATCH 1/3] Remove old update client scripts

For LmP ostree script is used instead.
---
 .../mbed-edge-core/mbed-edge-core-imx8mmevk.bb                 | 3 ---
 recipes-connectivity/mbed-edge-core/mbed-edge-core-uz.bb       | 3 ---
 2 files changed, 6 deletions(-)

diff --git a/recipes-connectivity/mbed-edge-core/mbed-edge-core-imx8mmevk.bb b/recipes-connectivity/mbed-edge-core/mbed-edge-core-imx8mmevk.bb
index 60a9bca..faa8831 100644
--- a/recipes-connectivity/mbed-edge-core/mbed-edge-core-imx8mmevk.bb
+++ b/recipes-connectivity/mbed-edge-core/mbed-edge-core-imx8mmevk.bb
@@ -34,8 +34,5 @@ do_configure_prepend() {
 
 
 do_install_append() {
-    install -m 755 "${SCRIPT_DIR}/arm_update_cmdline.sh"                  "${D}/wigwag/mbed"
-    install -m 755 "${SCRIPT_DIR}/yocto_generic/arm_update_activate.sh"       "${D}/wigwag/mbed"
-    install -m 755 "${SCRIPT_DIR}/yocto_generic/arm_update_active_details.sh" "${D}/wigwag/mbed"
     install -m 755 "${WORKDIR}/deploy_ostree_delta_update.sh" "${D}/wigwag/mbed"
 }
diff --git a/recipes-connectivity/mbed-edge-core/mbed-edge-core-uz.bb b/recipes-connectivity/mbed-edge-core/mbed-edge-core-uz.bb
index 61425dd..ce2cc22 100644
--- a/recipes-connectivity/mbed-edge-core/mbed-edge-core-uz.bb
+++ b/recipes-connectivity/mbed-edge-core/mbed-edge-core-uz.bb
@@ -32,8 +32,5 @@ do_configure_prepend() {
 }
 
 do_install_append() {
-    install -m 755 "${SCRIPT_DIR}/arm_update_cmdline.sh"                  "${D}/wigwag/mbed"
-    install -m 755 "${SCRIPT_DIR}/yocto_generic/arm_update_activate.sh"       "${D}/wigwag/mbed"
-    install -m 755 "${SCRIPT_DIR}/yocto_generic/arm_update_active_details.sh" "${D}/wigwag/mbed"
     install -m 755 "${WORKDIR}/deploy_ostree_delta_update.sh" "${D}/wigwag/mbed"
 }

From 566ee6cefbd4066c61185481ec4b3a008c459c09 Mon Sep 17 00:00:00 2001
From: Pete Dyer <pete.dyer@arm.com>
Date: Fri, 16 Apr 2021 11:18:46 +0100
Subject: [PATCH 2/3] Revert "Remove old update client scripts"

---
 .../mbed-edge-core/mbed-edge-core-imx8mmevk.bb                 | 3 +++
 recipes-connectivity/mbed-edge-core/mbed-edge-core-uz.bb       | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/recipes-connectivity/mbed-edge-core/mbed-edge-core-imx8mmevk.bb b/recipes-connectivity/mbed-edge-core/mbed-edge-core-imx8mmevk.bb
index faa8831..60a9bca 100644
--- a/recipes-connectivity/mbed-edge-core/mbed-edge-core-imx8mmevk.bb
+++ b/recipes-connectivity/mbed-edge-core/mbed-edge-core-imx8mmevk.bb
@@ -34,5 +34,8 @@ do_configure_prepend() {
 
 
 do_install_append() {
+    install -m 755 "${SCRIPT_DIR}/arm_update_cmdline.sh"                  "${D}/wigwag/mbed"
+    install -m 755 "${SCRIPT_DIR}/yocto_generic/arm_update_activate.sh"       "${D}/wigwag/mbed"
+    install -m 755 "${SCRIPT_DIR}/yocto_generic/arm_update_active_details.sh" "${D}/wigwag/mbed"
     install -m 755 "${WORKDIR}/deploy_ostree_delta_update.sh" "${D}/wigwag/mbed"
 }
diff --git a/recipes-connectivity/mbed-edge-core/mbed-edge-core-uz.bb b/recipes-connectivity/mbed-edge-core/mbed-edge-core-uz.bb
index ce2cc22..61425dd 100644
--- a/recipes-connectivity/mbed-edge-core/mbed-edge-core-uz.bb
+++ b/recipes-connectivity/mbed-edge-core/mbed-edge-core-uz.bb
@@ -32,5 +32,8 @@ do_configure_prepend() {
 }
 
 do_install_append() {
+    install -m 755 "${SCRIPT_DIR}/arm_update_cmdline.sh"                  "${D}/wigwag/mbed"
+    install -m 755 "${SCRIPT_DIR}/yocto_generic/arm_update_activate.sh"       "${D}/wigwag/mbed"
+    install -m 755 "${SCRIPT_DIR}/yocto_generic/arm_update_active_details.sh" "${D}/wigwag/mbed"
     install -m 755 "${WORKDIR}/deploy_ostree_delta_update.sh" "${D}/wigwag/mbed"
 }

From d1256992b55f1a56eef1bef5094874523faae5d0 Mon Sep 17 00:00:00 2001
From: Anton Antonov <Anton.Antonov@arm.com>
Date: Mon, 19 Apr 2021 11:14:36 +0100
Subject: [PATCH 3/3] Add Parsec SE driver 0.5.0 recipe

Signed-off-by: Anton Antonov <Anton.Antonov@arm.com>
---
 .../parsec-se-driver_0.5.0.bb                 |  16 +--
 .../parsec-se-driver_0.5.0.inc                | 113 ++++++++++++++++++
 2 files changed, 116 insertions(+), 13 deletions(-)
 create mode 100644 recipes-connectivity/parsec-se-driver/parsec-se-driver_0.5.0.inc

diff --git a/recipes-connectivity/parsec-se-driver/parsec-se-driver_0.5.0.bb b/recipes-connectivity/parsec-se-driver/parsec-se-driver_0.5.0.bb
index ffd7cb3..f74c724 100644
--- a/recipes-connectivity/parsec-se-driver/parsec-se-driver_0.5.0.bb
+++ b/recipes-connectivity/parsec-se-driver/parsec-se-driver_0.5.0.bb
@@ -1,9 +1,9 @@
-inherit cargo
 
 SUMMARY = "Parsec Secure Element Driver"
 HOMEPAGE = "https://github.com/parallaxsecond/parsec-se-driver"
 LICENSE = "Apache-2.0"
 
+inherit cargo
 SRC_URI = "git://github.com/parallaxsecond/parsec-se-driver.git;protocol=https;branch=main \
            git://github.com/ARMmbed/mbedtls.git;protocol=https;destsuffix=mbedtls;name=mbedtls"
 
@@ -13,20 +13,8 @@ SRCREV_mbedtls = "mbedtls-2.25.0"
 S = "${WORKDIR}/git"
 S_MBEDTLS = "${WORKDIR}/mbedtls"
 
-LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-BBCLASSEXTEND = "native"
-
 TOOLCHAIN = "clang"
 
-CARGO_DISABLE_BITBAKE_VENDORING = "1"
-CARGO_VENDORING_DIRECTORY="${S}/vendor"
-
-do_configure_append() {
-    cd ${S}
-    cargo vendor
-}
-
 do_compile_prepend() {
     export MBEDTLS_INCLUDE_DIR="${S_MBEDTLS}/include"
 }
@@ -35,3 +23,5 @@ do_install() {
     install -d "${D}/${libdir}"
     install -m 755 "${B}/target/${TARGET_SYS}/release/libparsec_se_driver.a" "${D}/${libdir}"
 }
+
+include parsec-se-driver_${PV}.inc
diff --git a/recipes-connectivity/parsec-se-driver/parsec-se-driver_0.5.0.inc b/recipes-connectivity/parsec-se-driver/parsec-se-driver_0.5.0.inc
new file mode 100644
index 0000000..eeaa8a7
--- /dev/null
+++ b/recipes-connectivity/parsec-se-driver/parsec-se-driver_0.5.0.inc
@@ -0,0 +1,113 @@
+# This file is created  using cargo-bitbake tool from parsec-se-driver repository Cargo.lock
+
+SRC_URI += " \
+    crate://crates.io/aho-corasick/0.7.15 \
+    crate://crates.io/ansi_term/0.11.0 \
+    crate://crates.io/anyhow/1.0.40 \
+    crate://crates.io/atty/0.2.14 \
+    crate://crates.io/autocfg/1.0.1 \
+    crate://crates.io/bincode/1.3.3 \
+    crate://crates.io/bindgen/0.56.0 \
+    crate://crates.io/bitflags/1.2.1 \
+    crate://crates.io/bytes/0.5.6 \
+    crate://crates.io/cc/1.0.67 \
+    crate://crates.io/cexpr/0.4.0 \
+    crate://crates.io/cfg-if/1.0.0 \
+    crate://crates.io/clang-sys/1.2.0 \
+    crate://crates.io/clap/2.33.3 \
+    crate://crates.io/cmake/0.1.45 \
+    crate://crates.io/derivative/2.2.0 \
+    crate://crates.io/either/1.6.1 \
+    crate://crates.io/env_logger/0.7.1 \
+    crate://crates.io/env_logger/0.8.3 \
+    crate://crates.io/fixedbitset/0.2.0 \
+    crate://crates.io/form_urlencoded/1.0.1 \
+    crate://crates.io/getrandom/0.2.2 \
+    crate://crates.io/glob/0.3.0 \
+    crate://crates.io/hashbrown/0.9.1 \
+    crate://crates.io/heck/0.3.2 \
+    crate://crates.io/hermit-abi/0.1.18 \
+    crate://crates.io/humantime/1.3.0 \
+    crate://crates.io/humantime/2.1.0 \
+    crate://crates.io/idna/0.2.3 \
+    crate://crates.io/indexmap/1.6.2 \
+    crate://crates.io/itertools/0.8.2 \
+    crate://crates.io/lazy_static/1.4.0 \
+    crate://crates.io/lazycell/1.3.0 \
+    crate://crates.io/libc/0.2.93 \
+    crate://crates.io/libloading/0.7.0 \
+    crate://crates.io/log/0.4.14 \
+    crate://crates.io/matches/0.1.8 \
+    crate://crates.io/memchr/2.3.4 \
+    crate://crates.io/multimap/0.8.3 \
+    crate://crates.io/nom/5.1.2 \
+    crate://crates.io/num-bigint/0.3.2 \
+    crate://crates.io/num-complex/0.3.1 \
+    crate://crates.io/num-derive/0.3.3 \
+    crate://crates.io/num-integer/0.1.44 \
+    crate://crates.io/num-iter/0.1.42 \
+    crate://crates.io/num-rational/0.3.2 \
+    crate://crates.io/num-traits/0.2.14 \
+    crate://crates.io/num/0.3.1 \
+    crate://crates.io/parsec-client/0.12.0 \
+    crate://crates.io/parsec-interface/0.24.0 \
+    crate://crates.io/peeking_take_while/0.1.2 \
+    crate://crates.io/percent-encoding/2.1.0 \
+    crate://crates.io/petgraph/0.5.1 \
+    crate://crates.io/ppv-lite86/0.2.10 \
+    crate://crates.io/proc-macro2/1.0.26 \
+    crate://crates.io/prost-build/0.6.1 \
+    crate://crates.io/prost-derive/0.6.1 \
+    crate://crates.io/prost-types/0.6.1 \
+    crate://crates.io/prost/0.6.1 \
+    crate://crates.io/psa-crypto-sys/0.8.0 \
+    crate://crates.io/psa-crypto/0.8.0 \
+    crate://crates.io/quick-error/1.2.3 \
+    crate://crates.io/quote/1.0.9 \
+    crate://crates.io/rand/0.8.3 \
+    crate://crates.io/rand_chacha/0.3.0 \
+    crate://crates.io/rand_core/0.6.2 \
+    crate://crates.io/rand_hc/0.3.0 \
+    crate://crates.io/redox_syscall/0.2.6 \
+    crate://crates.io/regex-syntax/0.6.23 \
+    crate://crates.io/regex/1.4.5 \
+    crate://crates.io/remove_dir_all/0.5.3 \
+    crate://crates.io/rustc-hash/1.1.0 \
+    crate://crates.io/same-file/1.0.6 \
+    crate://crates.io/secrecy/0.7.0 \
+    crate://crates.io/serde/1.0.125 \
+    crate://crates.io/serde_derive/1.0.125 \
+    crate://crates.io/shlex/0.1.1 \
+    crate://crates.io/strsim/0.8.0 \
+    crate://crates.io/syn/1.0.69 \
+    crate://crates.io/synstructure/0.12.4 \
+    crate://crates.io/tempfile/3.2.0 \
+    crate://crates.io/termcolor/1.1.2 \
+    crate://crates.io/textwrap/0.11.0 \
+    crate://crates.io/tinyvec/1.2.0 \
+    crate://crates.io/tinyvec_macros/0.1.0 \
+    crate://crates.io/unicode-bidi/0.3.5 \
+    crate://crates.io/unicode-normalization/0.1.17 \
+    crate://crates.io/unicode-segmentation/1.7.1 \
+    crate://crates.io/unicode-width/0.1.8 \
+    crate://crates.io/unicode-xid/0.2.1 \
+    crate://crates.io/url/2.2.1 \
+    crate://crates.io/users/0.10.0 \
+    crate://crates.io/uuid/0.8.2 \
+    crate://crates.io/vec_map/0.8.2 \
+    crate://crates.io/version_check/0.9.3 \
+    crate://crates.io/walkdir/2.3.2 \
+    crate://crates.io/wasi/0.10.2+wasi-snapshot-preview1 \
+    crate://crates.io/which/3.1.1 \
+    crate://crates.io/winapi-i686-pc-windows-gnu/0.4.0 \
+    crate://crates.io/winapi-util/0.1.5 \
+    crate://crates.io/winapi-x86_64-pc-windows-gnu/0.4.0 \
+    crate://crates.io/winapi/0.3.9 \
+    crate://crates.io/zeroize/1.2.0 \
+    crate://crates.io/zeroize_derive/1.0.1 \
+"
+
+# FIXME: update generateme with the real MD5 of the license file
+LIC_FILES_CHKSUM = " \
+    file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
+"