17 files changed, 20 insertions, 42 deletions

diff --git a/recipes-extended/crconf/crconf_git.bb b/recipes-extended/crconf/crconf_git.bb
index 755365d6d..ed76351e1 100644
--- a/recipes-extended/crconf/crconf_git.bb
+++ b/recipes-extended/crconf/crconf_git.bb
@@ -8,8 +8,6 @@ EXTRA_OEMAKE = "'CC=${CC}' 'HOSTCC=${CC}' SBINDIR='${sbindir}' MANDIR='${mandir}
 SRC_URI = "git://git.code.sf.net/p/crconf/code;protocol=https;nobranch=1"
 SRCREV = "c2b9595d739a9515a86ff3b1980b5cfdfcc42d68"
 
-S = "${WORKDIR}/git"
-
 do_install () {
        oe_runmake install  DESTDIR=${D}
 }
diff --git a/recipes-extended/dpdk/dpdk-20.11.inc b/recipes-extended/dpdk/dpdk-20.11.inc
index 90b4c405a..66bcda2ff 100644
--- a/recipes-extended/dpdk/dpdk-20.11.inc
+++ b/recipes-extended/dpdk/dpdk-20.11.inc
@@ -8,8 +8,6 @@ LIC_FILES_CHKSUM = "file://license/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4
 SRC_URI = "git://github.com/nxp-qoriq/dpdk;protocol=https;nobranch=1"
 SRCREV = "f74b8bd5ab1c6ff76e956fc202a56aea2d200270"
 
-S = "${WORKDIR}/git"
-
 COMPATIBLE_MACHINE = "(qoriq-arm64)"
 
 CVE_PRODUCT = "data_plane_development_kit"
diff --git a/recipes-extended/dpdk/dpdk-module_20.11.bb b/recipes-extended/dpdk/dpdk-module_20.11.bb
index 180b140ba..585e198ea 100644
--- a/recipes-extended/dpdk/dpdk-module_20.11.bb
+++ b/recipes-extended/dpdk/dpdk-module_20.11.bb
@@ -14,7 +14,7 @@ DEPENDS += "dpdk"
 export S
 export STAGING_KERNEL_DIR
 export STAGING_INCDIR
-export INSTALL_MOD_DIR="dpdk"
+export INSTALL_MOD_DIR = "dpdk"
 
 do_configure[noexec] = "1"
 
diff --git a/recipes-extended/dpdk/dpdk.inc b/recipes-extended/dpdk/dpdk.inc
index f2ab1370a..eabd18650 100644
--- a/recipes-extended/dpdk/dpdk.inc
+++ b/recipes-extended/dpdk/dpdk.inc
@@ -26,8 +26,6 @@ export RTE_TARGET = "${DPDK_RTE_TARGET}"
 export RTE_OUTPUT = "${S}/${RTE_TARGET}"
 export  MODULE_DIR = "${nonarch_base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/net"
 
-S = "${WORKDIR}/git"
-
 EXTRA_OEMAKE += 'ETHTOOL_LIB_PATH="${S}/examples/ethtool/lib/${RTE_TARGET}" RTE_SDK="${S}" \
     OPENSSL_PATH="${STAGING_DIR_HOST}" RTE_KERNELDIR="${STAGING_KERNEL_DIR}" \
     RTE_KERNELDIR_OUT="${STAGING_KERNEL_BUILDDIR}" EXAMPLES_BUILD_DIR="${RTE_TARGET}" \
diff --git a/recipes-extended/jailhouse/jailhouse-imx_git.bb b/recipes-extended/jailhouse/jailhouse-imx_git.bb
index c230cc3a5..a955c8fd3 100644
--- a/recipes-extended/jailhouse/jailhouse-imx_git.bb
+++ b/recipes-extended/jailhouse/jailhouse-imx_git.bb
@@ -16,8 +16,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=9fa7f895f96bde2d47fd5b7d95b6ba4d \
 PROVIDES = "jailhouse"
 RPROVIDES:${PN} += "jailhouse"
 
-SRCBRANCH = "lf-6.6.3_1.0.0"
-SRCREV = "184a287f4c4c63a3842a3b582b5d700e0f9fd9a4"
+SRCBRANCH = "lf-6.6.52_2.2.0"
+SRCREV = "44dd492a745cd8b8313fb6c7c03fb45a36d70e8a"
 
 IMX_JAILHOUSE_SRC ?= "git://github.com/nxp-imx/imx-jailhouse.git;protocol=https"
 SRC_URI = "${IMX_JAILHOUSE_SRC};branch=${SRCBRANCH} \
@@ -33,7 +33,6 @@ DEPENDS = " \
 
 inherit module bash-completion deploy setuptools3
 
-S = "${WORKDIR}/git"
 B = "${S}"
 
 JH_ARCH = "arm64"
diff --git a/recipes-extended/libpkcs11/libpkcs11_git.bb b/recipes-extended/libpkcs11/libpkcs11_git.bb
index 731b7a234..347a8ef9a 100644
--- a/recipes-extended/libpkcs11/libpkcs11_git.bb
+++ b/recipes-extended/libpkcs11/libpkcs11_git.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "PKCS library"
-LICENSE = "GPL-2.0-only & BSD"
+LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=803852533e29eb1d6d5e55ad3078b625"
 
 SRC_URI = "git://github.com/nxp-qoriq/libpkcs11;protocol=https;nobranch=1 \
@@ -9,8 +9,6 @@ SRCREV = "8d85182b7a7cd393ab6dd72930f8d1b69468f741"
 
 DEPENDS = "openssl secure-obj"
 
-S = "${WORKDIR}/git"
-
 WRAP_TARGET_PREFIX ?= "${TARGET_PREFIX}"
 export CROSS_COMPILE_HOST = "${CROSS_COMPILE}"
 export CROSS_COMPILE_TA = "${CROSS_COMPILE}"
diff --git a/recipes-extended/merge-files/merge-files_1.0.bb b/recipes-extended/merge-files/merge-files_1.0.bb
index 5b3ca7edc..bd788fdb5 100644
--- a/recipes-extended/merge-files/merge-files_1.0.bb
+++ b/recipes-extended/merge-files/merge-files_1.0.bb
@@ -5,14 +5,13 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384
 inherit allarch
 
 SRC_URI = "file://merge"
-S = "${WORKDIR}"
 
 MERGED_DST ?= "${ROOT_HOME}"
 do_install () {
     install -d ${D}/${MERGED_DST}
-    find ${WORKDIR}/merge/ -maxdepth 1 -mindepth 1 -not -name README \
+    find ${UNPACKDIR}/merge/ -maxdepth 1 -mindepth 1 -not -name README \
     -exec cp -fr '{}' ${D}/${MERGED_DST}/ \;
-    find ${WORKDIR}/merge/ -maxdepth 1 -mindepth 1 -exec rm -fr '{}' \;
+    find ${UNPACKDIR}/merge/ -maxdepth 1 -mindepth 1 -exec rm -fr '{}' \;
 }
 do_configure[noexec] = "1"
 do_compile[noexec] = "1"
diff --git a/recipes-extended/odp/odp.inc b/recipes-extended/odp/odp.inc
index 0c90d0c57..34bd5138e 100644
--- a/recipes-extended/odp/odp.inc
+++ b/recipes-extended/odp/odp.inc
@@ -22,6 +22,5 @@ SRCREV_qbman = "75ff61a7ca6acdbdbb780161b053cbcbc990f1be"
 SRCREV_rta = "bbab28b03ae21c52ce913f8b052acf53bd24ff5d"
 
 SRCREV_FORMAT = "default_qbman_rta"
-S = "${WORKDIR}/git"
 
 COMPATIBLE_MACHINE = "(ls1043a|ls1046a|ls2088a|ls1088a)"
diff --git a/recipes-extended/ofp/ofp_git.bb b/recipes-extended/ofp/ofp_git.bb
index 47e543154..0f90dc5bb 100644
--- a/recipes-extended/ofp/ofp_git.bb
+++ b/recipes-extended/ofp/ofp_git.bb
@@ -10,8 +10,6 @@ SRC_URI = "git://github.com/nxp-qoriq/ofp;protocol=https;nobranch=1"
 
 SRCREV = "fe66f4659f7d356f7aa73a8fb32fcf67c6cf1108"
 
-S = "${WORKDIR}/git"
-
 inherit autotools-brokensep pkgconfig
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/recipes-extended/ovs-dpdk/ovs-dpdk_2.15.bb b/recipes-extended/ovs-dpdk/ovs-dpdk_2.15.bb
index 20d06dd61..a21bc69cf 100644
--- a/recipes-extended/ovs-dpdk/ovs-dpdk_2.15.bb
+++ b/recipes-extended/ovs-dpdk/ovs-dpdk_2.15.bb
@@ -10,8 +10,6 @@ inherit python3native pkgconfig
 SRC_URI = "git://github.com/nxp-qoriq/ovs-dpdk;protocol=https;nobranch=1"
 SRCREV = "f2c0744d2f68c4cd2840d6e409d7b0520e4caf99"
 
-S = "${WORKDIR}/git"
-
 do_configure() {
         export SYSROOT_DPDK=${PKG_CONFIG_SYSROOT_DIR}
         ${S}/boot.sh
diff --git a/recipes-extended/pktgen-dpdk/pktgen-dpdk_21.05.0.bb b/recipes-extended/pktgen-dpdk/pktgen-dpdk_21.05.0.bb
index f04e1e9f5..485f763bf 100644
--- a/recipes-extended/pktgen-dpdk/pktgen-dpdk_21.05.0.bb
+++ b/recipes-extended/pktgen-dpdk/pktgen-dpdk_21.05.0.bb
@@ -9,8 +9,6 @@ SRC_URI = "git://dpdk.org/git/apps/pktgen-dpdk;protocol=https;nobranch=1 \
 "
 SRCREV = "3a09aa916597fb9a97ee8eec50044cbdb9c4abde"
 
-S = "${WORKDIR}/git"
-
 DPAA_VER ?= "dpaa"
 export RTE_TARGET = "arm64-${DPAA_VER}-linuxapp-gcc"
 export RTE_SDK = "${RECIPE_SYSROOT}/usr/share/dpdk"
diff --git a/recipes-extended/secure-obj/secure-obj-module_git.bb b/recipes-extended/secure-obj/secure-obj-module_git.bb
index 3866dde48..c6bbc41df 100644
--- a/recipes-extended/secure-obj/secure-obj-module_git.bb
+++ b/recipes-extended/secure-obj/secure-obj-module_git.bb
@@ -1,11 +1,11 @@
 require secure-obj.inc
 
-LIC_FILES_CHKSUM = "file://../README;md5=82b72e88f23cded9dd23f0fb1790b8d2"
+LIC_FILES_CHKSUM = "file://../LICENSE;md5=751419260aa954499f7abaabaa882bbe"
 
 DEPENDS += "virtual/kernel"
 
 inherit module 
 
-S = "${WORKDIR}/git/securekeydev"
+S = "${UNPACKDIR}/${BP}/securekeydev"
 
 EXTRA_OEMAKE += 'KERNEL_SRC="${STAGING_KERNEL_DIR}"'
diff --git a/recipes-extended/secure-obj/secure-obj.inc b/recipes-extended/secure-obj/secure-obj.inc
index 64e4a6b71..16115ff03 100644
--- a/recipes-extended/secure-obj/secure-obj.inc
+++ b/recipes-extended/secure-obj/secure-obj.inc
@@ -1,5 +1,5 @@
 DESCRIPTION = "Secure Object"
-LICENSE = "BSD"
+LICENSE = "BSD-3-Clause"
 
 DEPENDS = "openssl optee-os-qoriq optee-client-qoriq"
 RDEPENDS:${PN} = "bash libcrypto libssl"
@@ -11,7 +11,7 @@ inherit python3native
 LDFLAGS += "${TOOLCHAIN_OPTIONS}"
 
 SRC_URI = "git://github.com/nxp-qoriq/secure_obj;protocol=https;nobranch=1"
-SRCREV = "5ff1231f74b4b01744be95a3137a14ad0a483e61"
+SRCREV = "4706a6534ec09f9a46bfe305c5e49badca32b4c6"
 
 WRAP_TARGET_PREFIX ?= "${TARGET_PREFIX}"
 export SECURE_STORAGE_PATH = "${S}/secure_storage_ta/ta/"
diff --git a/recipes-extended/secure-obj/secure-obj_git.bb b/recipes-extended/secure-obj/secure-obj_git.bb
index 84ecea1ea..4d197f57c 100644
--- a/recipes-extended/secure-obj/secure-obj_git.bb
+++ b/recipes-extended/secure-obj/secure-obj_git.bb
@@ -1,9 +1,9 @@
 require secure-obj.inc
 
-LIC_FILES_CHKSUM = "file://README;md5=82b72e88f23cded9dd23f0fb1790b8d2"
-
-S = "${WORKDIR}/git"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe"
 
+DEPENDS:remove = " python3-pycryptodomex-native"
+DEPENDS:append = " python3-cryptography-native optee-os-qoriq-tadevkit"
 RDEPENDS:{PN}  += "secure-obj-module"
 
 WRAP_TARGET_PREFIX ?= "${TARGET_PREFIX}"
@@ -17,14 +17,15 @@ CFLAGS += "${TOOLCHAIN_OPTIONS}"
 
 do_compile() {
         unset LDFLAGS
-        export TA_DEV_KIT_DIR="${RECIPE_SYSROOT}/usr/include/optee/export-user_ta"
+        export TA_DEV_KIT_DIR=${STAGING_INCDIR}/optee/export-user_ta/
         export CROSS_COMPILE="${WRAP_TARGET_PREFIX}"
-        export OPENSSL_PATH="${RECIPE_SYSROOT}/usr" 
-        for APP in  secure_storage_ta securekey_lib secure_obj-openssl-engine; do        
+        export OPENSSL_PATH="${RECIPE_SYSROOT}/usr"
+        export OPENSSL_MODULES=${STAGING_LIBDIR_NATIVE}/ossl-modules
+        for APP in  secure_storage_ta securekey_lib secure_obj-openssl-engine; do
             cd  ${APP}
             oe_runmake
             cd ..
-        done       
+        done
 }
 
 do_install() {
diff --git a/recipes-extended/skmm-ep/skmm-ep_git.bb b/recipes-extended/skmm-ep/skmm-ep_git.bb
index c08c94923..72638766c 100644
--- a/recipes-extended/skmm-ep/skmm-ep_git.bb
+++ b/recipes-extended/skmm-ep/skmm-ep_git.bb
@@ -12,8 +12,6 @@ SRC_URI = "git://github.com/nxp-qoriq-yocto-sdk/skmm-ep;protocol=https;nobranch=
 "
 SRCREV = "de6816c7d66129683bc62229b482ac3cf585d896"
 
-S = "${WORKDIR}/git"
-
 EXTRA_OEMAKE = 'ARCH=${TARGET_ARCH} MACHINE=${MACHINE} EXTRA_LDFLAGS="${LDFLAGS}"'
 
 export LIBEDIT_CFLAGS = "`pkg-config --cflags libedit`"
diff --git a/recipes-extended/testfloat/testfloat_2a.bb b/recipes-extended/testfloat/testfloat_2a.bb
index 4ed2ceb39..45e9365da 100644
--- a/recipes-extended/testfloat/testfloat_2a.bb
+++ b/recipes-extended/testfloat/testfloat_2a.bb
@@ -10,15 +10,13 @@ SRC_URI:append:qoriq-ppc = " file://SoftFloat-powerpc-1.patch \
                               file://TestFloat-powerpc-E500v2-SPE-1.patch \
                               file://Yocto-replace-COMPILE_PREFIX-gcc.patch \
                             "
-SRC_URI[TestFloat.md5sum] = "4dc889319ae1e0c5381ec511f784553a"
 SRC_URI[TestFloat.sha256sum] = "84d14aa42adefbda2ec9708b42946f7fa59f93689b042684bd027863481f8e4e"
-SRC_URI[SoftFloat.md5sum] = "b4a58b5c941f1a2317e4c2500086e3fa"
 SRC_URI[SoftFloat.sha256sum] = "89d14b55113a2ba8cbda7011443ba1d298d381c89d939515d56c5f18f2febf81"
 
-S = "${WORKDIR}/TestFloat-2a"
+S = "${UNPACKDIR}/TestFloat-2a"
 
 do_unpack2(){
-    mv ${WORKDIR}/SoftFloat-2b ${S}/SoftFloat-2b
+    mv ${UNPACKDIR}/SoftFloat-2b ${S}/SoftFloat-2b
     cd ${S}
     if [ -n "$(which fromdos)" ];then
         find -type f -exec fromdos {} \;
diff --git a/recipes-extended/tsntool/tsntool_git.bb b/recipes-extended/tsntool/tsntool_git.bb
index 2ad4a0c49..f70e64e2b 100644
--- a/recipes-extended/tsntool/tsntool_git.bb
+++ b/recipes-extended/tsntool/tsntool_git.bb
@@ -16,8 +16,6 @@ SRC_URI:append = " \
         file://0001-tsntool-remove-redundant-parameters-from-BIN_LDFLAGS.patch \
 "
 
-S = "${WORKDIR}/git"
-
 do_configure[depends] += "virtual/kernel:do_shared_workdir"
 
 do_compile:prepend() {