From 2a2f8de45da725c2738b8efcdc00b3fb12dd2eb3 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 11 Feb 2023 15:11:57 -0800 Subject: [PATCH 1/3] egt-media: Use renamed plugin packagename videoconvertscale since gstreamer 1.22 videoconvert/videoscale plgins were merged into one and main recipe reflects that, therefore adjust accordingly Fixes ERROR: QA Issue: egt-media rdepends on gstreamer1.0-plugins-base-videoconvert, but it isn't a build dependency? [build-deps] ERROR: QA Issue: egt-media rdepends on gstreamer1.0-plugins-base-videoscale, but it isn't a build dependency? [build-deps] Signed-off-by: Khem Raj --- recipes-egt/apps/egt-media_1.3.bb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/recipes-egt/apps/egt-media_1.3.bb b/recipes-egt/apps/egt-media_1.3.bb index 7c874fba..8cf0a810 100644 --- a/recipes-egt/apps/egt-media_1.3.bb +++ b/recipes-egt/apps/egt-media_1.3.bb @@ -15,8 +15,7 @@ RDEPENDS:${PN} = "gstreamer1.0 \ gstreamer1.0-plugins-base-playback \ gstreamer1.0-plugins-base-audioconvert \ gstreamer1.0-plugins-base-audioresample \ - gstreamer1.0-plugins-base-videoscale \ - gstreamer1.0-plugins-base-videoconvert \ + gstreamer1.0-plugins-base-videoconvertscale \ gstreamer1.0-plugins-base-volume \ ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "gstreamer1.0-libav", "", d)} \ " From 186cc91100a8c16e20a90744a9f8ae95be0d176a Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 12 Feb 2023 09:30:02 -0800 Subject: [PATCH 2/3] optee: Limit sam specific changes to sam alone This ensures that layer can be used along with other ARM BSP layers and does not insert itself forcefully into those machines Signed-off-by: Khem Raj --- .../optee/optee-os-tadevkit_%.bbappend | 9 +++---- recipes-security/optee/optee-os_%.bbappend | 26 ++++++++----------- 2 files changed, 15 insertions(+), 20 deletions(-) diff --git a/recipes-security/optee/optee-os-tadevkit_%.bbappend b/recipes-security/optee/optee-os-tadevkit_%.bbappend index 9b160fd6..451e6be5 100644 --- a/recipes-security/optee/optee-os-tadevkit_%.bbappend +++ b/recipes-security/optee/optee-os-tadevkit_%.bbappend @@ -1,11 +1,10 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" -SRC_URI = "git://github.com/linux4sam/optee_os-at91.git;branch=master;protocol=https" +SRC_URI:sama5d27-som1-ek-optee-sd = "git://github.com/linux4sam/optee_os-at91.git;branch=master;protocol=https" -SRCREV = "9ca99a29b95e7b07c4849d9578dd633a4aed00fb" +SRCREV:sama5d27-som1-ek-optee-sd = "9ca99a29b95e7b07c4849d9578dd633a4aed00fb" -OPTEEMACHINE = "sam" +OPTEEMACHINE:sama5d27-som1-ek-optee-sd = "sam" -DEPENDS:append = " dtc-native" +DEPENDS:append:sama5d27-som1-ek-optee-sd = " dtc-native" -COMPATIBLE_MACHINE = "(sama5d27-som1-ek-optee-sd)" diff --git a/recipes-security/optee/optee-os_%.bbappend b/recipes-security/optee/optee-os_%.bbappend index 18dc3574..1b542a8b 100644 --- a/recipes-security/optee/optee-os_%.bbappend +++ b/recipes-security/optee/optee-os_%.bbappend @@ -1,21 +1,19 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" -OPTEEMACHINE = "sam" +OPTEEMACHINE:sama5d27-som1-ek-optee-sd = "sam" -DEPENDS:append = " dtc-native" +DEPENDS:append:sama5d27-som1-ek-optee-sd = " dtc-native" -SRC_URI = "git://github.com/linux4sam/optee_os-at91.git;branch=master;protocol=https" +SRC_URI:sama5d27-som1-ek-optee-sd = "git://github.com/linux4sam/optee_os-at91.git;branch=master;protocol=https" -SRCREV = "9ca99a29b95e7b07c4849d9578dd633a4aed00fb" +SRCREV:sama5d27-som1-ek-optee-sd = "9ca99a29b95e7b07c4849d9578dd633a4aed00fb" -COMPATIBLE_MACHINE = "(sama5d27-som1-ek-optee-sd)" +OPTEE_SUFFIX:sama5d27-som1-ek-optee-sd ?= "bin" +OPTEE_IMAGE:sama5d27-som1-ek-optee-sd ?= "tee-${MACHINE}-${PV}-${PR}.${OPTEE_SUFFIX}" +OPTEE_BINARY:sama5d27-som1-ek-optee-sd ?= "tee.${OPTEE_SUFFIX}" +OPTEE_SYMLINK:sama5d27-som1-ek-optee-sd ?= "tee-${MACHINE}.${OPTEE_SUFFIX}" -OPTEE_SUFFIX ?= "bin" -OPTEE_IMAGE ?= "tee-${MACHINE}-${PV}-${PR}.${OPTEE_SUFFIX}" -OPTEE_BINARY ?= "tee.${OPTEE_SUFFIX}" -OPTEE_SYMLINK ?= "tee-${MACHINE}.${OPTEE_SUFFIX}" - -do_install:append() { +do_install:append:sama5d27-som1-ek-optee-sd() { #install core in boot install -d ${D}/boot install -m 644 ${B}/core/*.bin ${B}/core/tee.elf ${D}/boot/ @@ -23,9 +21,7 @@ do_install:append() { ln -sf ${OPTEE_IMAGE} ${D}/boot/${OPTEE_BINARY} } -PACKAGE_ARCH = "${MACHINE_ARCH}" - -do_deploy:append() { +do_deploy:append:sama5d27-som1-ek-optee-sd() { install -d ${DEPLOYDIR} install -m 644 ${D}/boot/* ${DEPLOYDIR}/ install ${B}/core/${OPTEE_BINARY} ${DEPLOYDIR}/${OPTEE_IMAGE} @@ -36,7 +32,7 @@ do_deploy:append() { ln -sf ${OPTEE_IMAGE} ${OPTEE_BINARY} } -SYSROOT_DIRS += "/boot/" +SYSROOT_DIRS:append:sama5d27-som1-ek-optee-sd = " /boot/" FILES:${PN} += "/boot/" FILESPATH =. "${FILE_DIRNAME}/optee-os/${MACHINE}:" From 06f99a2db7f2c8555fde88ba0baf659886353edd Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 13 Feb 2023 22:22:31 -0800 Subject: [PATCH 3/3] python3-cryptoauthlib: Update to 20221114 Fix build with latest setuptools and compiler errors seens with clang 16 Signed-off-by: Khem Raj --- ...-function-mismatches-in-function-poi.patch | 74 +++++++++++++++++++ ...t-the-python_requires-version-syntax.patch | 29 ++++++++ ...8.bb => python3-cryptoauthlib_20221114.bb} | 10 +-- 3 files changed, 107 insertions(+), 6 deletions(-) create mode 100644 recipes-support/python-cryptoauthlib/python3-cryptoauthlib/0001-atca_iface.h-Fix-function-mismatches-in-function-poi.patch create mode 100644 recipes-support/python-cryptoauthlib/python3-cryptoauthlib/0001-correct-the-python_requires-version-syntax.patch rename recipes-support/python-cryptoauthlib/{python3-cryptoauthlib_20200208.bb => python3-cryptoauthlib_20221114.bb} (52%) diff --git a/recipes-support/python-cryptoauthlib/python3-cryptoauthlib/0001-atca_iface.h-Fix-function-mismatches-in-function-poi.patch b/recipes-support/python-cryptoauthlib/python3-cryptoauthlib/0001-atca_iface.h-Fix-function-mismatches-in-function-poi.patch new file mode 100644 index 00000000..d5202260 --- /dev/null +++ b/recipes-support/python-cryptoauthlib/python3-cryptoauthlib/0001-atca_iface.h-Fix-function-mismatches-in-function-poi.patch @@ -0,0 +1,74 @@ +From 0b76ffe124719f96fe8bc3daf6410cf3198309f4 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 13 Feb 2023 22:07:10 -0800 +Subject: [PATCH] atca_iface.h: Fix function mismatches in function pointers + +Newer compilers e.g. clang16 can detect signature mismatches in the +functions used as function pointers, therefore correct the function +prototypes and ensure the typedefs they use are available at the time of +use + +Fixes +lib/hal/atca_hal.c:310:33: error: incompatible function pointer types assigning to 'ATCA_STATUS (*)(ATCAIface, ATCAIfaceCfg *)' (aka 'ATCA_STATUS (*)(struct atca_iface *, ATCAIfaceCfg *)') from 'ATCA_STATUS (*)(void *, void *)' [-Wincompatible-function- pointer-types] + (*hal)->halinit = cfg->atcacustom.halinit; + ^ ~~~~~~~~~~~~~~~~~~~~~~~ + +Upstream-Status: Submitted [https://github.com/MicrochipTech/cryptoauthlib/pull/330] +Signed-off-by: Khem Raj +--- + lib/atca_iface.h | 21 +++++++++------------ + 1 file changed, 9 insertions(+), 12 deletions(-) + +diff --git a/lib/atca_iface.h b/lib/atca_iface.h +index 9dfc422..e669b33 100644 +--- a/lib/atca_iface.h ++++ b/lib/atca_iface.h +@@ -81,11 +81,12 @@ typedef enum + ATCA_KIT_SPI_IFACE, + ATCA_KIT_UNKNOWN_IFACE } ATCAKitType; + ++typedef struct atca_iface * ATCAIface; + + /* ATCAIfaceCfg is the configuration object for a device + */ + +-typedef struct ++typedef struct ATCAIfaceCfgType + { + + ATCAIfaceType iface_type; // active iface - how to interpret the union below +@@ -147,13 +148,13 @@ typedef struct + + struct + { +- ATCA_STATUS (*halinit)(void *hal, void *cfg); +- ATCA_STATUS (*halpostinit)(void *iface); +- ATCA_STATUS (*halsend)(void *iface, uint8_t word_address, uint8_t *txdata, int txlength); +- ATCA_STATUS (*halreceive)(void *iface, uint8_t word_address, uint8_t* rxdata, uint16_t* rxlength); +- ATCA_STATUS (*halwake)(void *iface); +- ATCA_STATUS (*halidle)(void *iface); +- ATCA_STATUS (*halsleep)(void *iface); ++ ATCA_STATUS (*halinit)(ATCAIface hal, struct ATCAIfaceCfgType* cfg); ++ ATCA_STATUS (*halpostinit)(ATCAIface iface); ++ ATCA_STATUS (*halsend)(ATCAIface iface, uint8_t word_address, uint8_t *txdata, int txlength); ++ ATCA_STATUS (*halreceive)(ATCAIface iface, uint8_t word_address, uint8_t* rxdata, uint16_t* rxlength); ++ ATCA_STATUS (*halwake)(ATCAIface iface); ++ ATCA_STATUS (*halidle)(ATCAIface iface); ++ ATCA_STATUS (*halsleep)(ATCAIface iface); + ATCA_STATUS (*halrelease)(void* hal_data); + } atcacustom; + } ATCA_IFACECFG_NAME(cfg); +@@ -163,10 +164,6 @@ typedef struct + void * cfg_data; // opaque data used by HAL in device discovery + } ATCAIfaceCfg; + +- +- +-typedef struct atca_iface * ATCAIface; +- + /** \brief HAL Driver Structure + */ + typedef struct +-- +2.39.1 + diff --git a/recipes-support/python-cryptoauthlib/python3-cryptoauthlib/0001-correct-the-python_requires-version-syntax.patch b/recipes-support/python-cryptoauthlib/python3-cryptoauthlib/0001-correct-the-python_requires-version-syntax.patch new file mode 100644 index 00000000..299c798a --- /dev/null +++ b/recipes-support/python-cryptoauthlib/python3-cryptoauthlib/0001-correct-the-python_requires-version-syntax.patch @@ -0,0 +1,29 @@ +From 3138909f544e24cee6b14134148c22215816b15e Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 13 Feb 2023 16:55:42 -0800 +Subject: [PATCH] correct the python_requires version syntax + +Fixes errors like +'python_requires' must be a string containing valid version specifiers; Invalid specifier: '>=3.4.*' + +Upstream-Status: Submitted [https://github.com/MicrochipTech/cryptoauthlib/pull/330] +Signed-off-by: Khem Raj +--- + setup.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/setup.py b/setup.py +index 706574c..c06593b 100644 +--- a/setup.py ++++ b/setup.py +@@ -231,6 +231,6 @@ if __name__ == '__main__': + setup_requires=['setuptools>=38.6.0', 'wheel'], + install_requires=['enum34;python_version<"3.4"'], + ext_modules=_EXTENSIONS, +- python_requires='>=3.4.*', ++ python_requires='>=3.4.0', + zip_safe=False + ) +-- +2.39.1 + diff --git a/recipes-support/python-cryptoauthlib/python3-cryptoauthlib_20200208.bb b/recipes-support/python-cryptoauthlib/python3-cryptoauthlib_20221114.bb similarity index 52% rename from recipes-support/python-cryptoauthlib/python3-cryptoauthlib_20200208.bb rename to recipes-support/python-cryptoauthlib/python3-cryptoauthlib_20221114.bb index 69c32855..23535ab2 100644 --- a/recipes-support/python-cryptoauthlib/python3-cryptoauthlib_20200208.bb +++ b/recipes-support/python-cryptoauthlib/python3-cryptoauthlib_20221114.bb @@ -4,14 +4,12 @@ HOMEPAGE = "https://github.com/MicrochipTech/cryptoauthlib" LICENSE = "CLOSED" LIC_FILES_CHKSUM = "" -SRC_URI = "https://files.pythonhosted.org/packages/1b/ed/da1709095abd203e37892f7183b68433382ce6a0f6129dfa0ac47e2ba85c/cryptoauthlib-${PV}.tar.gz \ - ${PYPI_SRC_URI} \ - " -SRC_URI[md5sum] = "3a464cb6ea78286353870e544f85e208" -SRC_URI[sha256sum] = "7b04a4097c6f8d4b539c7425261eac3353016405b863fec2d827152ce3a652bf" - inherit pypi setuptools3 +SRC_URI += "file://0001-correct-the-python_requires-version-syntax.patch \ + file://0001-atca_iface.h-Fix-function-mismatches-in-function-poi.patch" +SRC_URI[sha256sum] = "cc63dba63f1983c12ad18ecb3f1595083feffc0cb827d2a8d3a54c850d26ed5d" + RDEPENDS:${PN} += "python3-core python3-cryptography python3-ctypes python3-datetime python3-netclient" DEPENDS += "cmake-native udev"