From 2e9528df4069fbbecc66554bb04e5fcfd95141c1 Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Wed, 30 Nov 2022 15:07:52 +0100 Subject: [PATCH] meta-digi: remove outdated overlayed recipes A new set of meta-freescale updates made these recipes outdated. Signed-off-by: Javier Viguera --- ...001-Makefile-Fix-LIBDIR-for-multilib.patch | 27 ------------- ...d-v2x_test-to-the-installed-binaries.patch | 32 --------------- ...tall-to-clear-host-user-contaminated.patch | 33 --------------- .../recipes-bsp/imx-seco/imx-seco-libs_git.bb | 30 -------------- .../recipes-bsp/imx-seco/imx-seco_3.8.4.bb | 28 ------------- .../imx-parser/imx-parser.inc | 40 ------------------- .../imx-parser/imx-parser_4.6.3.bb | 12 ------ 7 files changed, 202 deletions(-) delete mode 100644 meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-seco/imx-seco-libs/0001-Makefile-Fix-LIBDIR-for-multilib.patch delete mode 100644 meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-seco/imx-seco-libs/0001-add-v2x_test-to-the-installed-binaries.patch delete mode 100644 meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-seco/imx-seco-libs/0002-Makefile-Fix-install-to-clear-host-user-contaminated.patch delete mode 100644 meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-seco/imx-seco-libs_git.bb delete mode 100644 meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-seco/imx-seco_3.8.4.bb delete mode 100644 meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/imx-parser/imx-parser.inc delete mode 100644 meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/imx-parser/imx-parser_4.6.3.bb diff --git a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-seco/imx-seco-libs/0001-Makefile-Fix-LIBDIR-for-multilib.patch b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-seco/imx-seco-libs/0001-Makefile-Fix-LIBDIR-for-multilib.patch deleted file mode 100644 index 8d9f62982..000000000 --- a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-seco/imx-seco-libs/0001-Makefile-Fix-LIBDIR-for-multilib.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 9e89d173a7fab97c913960344ae01dfa409b6258 Mon Sep 17 00:00:00 2001 -From: Cristinel Panfir -Date: Mon, 27 Jul 2020 18:55:30 +0000 -Subject: [PATCH] Makefile: Fix LIBDIR for multilib - -Signed-off-by: Cristinel Panfir ---- - Makefile | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index b16cebf..492d700 100644 ---- a/Makefile -+++ b/Makefile -@@ -4,7 +4,8 @@ all: she_test hsm_test v2x_test she_lib.a seco_nvm_manager.a hsm_lib.a - CFLAGS = -O1 -Werror -fPIC - DESTDIR ?= export - BINDIR ?= /usr/bin --LIBDIR ?= /usr/lib -+base_libdir ?= /lib -+LIBDIR ?= /usr/$(base_libdir) - INCLUDEDIR ?= /usr/include - - ifdef COVERAGE --- -2.7.4 - diff --git a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-seco/imx-seco-libs/0001-add-v2x_test-to-the-installed-binaries.patch b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-seco/imx-seco-libs/0001-add-v2x_test-to-the-installed-binaries.patch deleted file mode 100644 index 8aa893f4a..000000000 --- a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-seco/imx-seco-libs/0001-add-v2x_test-to-the-installed-binaries.patch +++ /dev/null @@ -1,32 +0,0 @@ -From b62f020ea723dc33f28e5e865d0ddd13219971c9 Mon Sep 17 00:00:00 2001 -From: Cristinel Panfir -Date: Mon, 29 Mar 2021 15:24:42 +0300 -Subject: [PATCH] Makefile: Add v2x test to the installed-binaries - -Signed-off-by: Cristinel Panfir -[regenerate the patch to be applied after meta-imx patches] -Signed-off-by: Fausto Chiatante - ---- - Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index 25ad333..a397814 100644 ---- a/Makefile -+++ b/Makefile -@@ -61,9 +61,9 @@ hsm_doc: include/hsm/hsm_api.h - cp doc/latex/refman.pdf doc/hsm_api_document.pdf - rm -rf doc/latex/ - --install: hsm_test she_test she_lib.a seco_nvm_manager.a hsm_lib.a -+install: hsm_test she_test v2x_test she_lib.a seco_nvm_manager.a hsm_lib.a - mkdir -p $(DESTDIR)$(BINDIR) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(INCLUDEDIR) - cp seco_nvm_manager.a hsm_lib.a she_lib.a $(DESTDIR)$(LIBDIR) -- cp hsm_test she_test $(DESTDIR)$(BINDIR) -+ cp hsm_test she_test v2x_test $(DESTDIR)$(BINDIR) - cp -a include/* $(DESTDIR)$(INCLUDEDIR) - --- -2.25.1 - diff --git a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-seco/imx-seco-libs/0002-Makefile-Fix-install-to-clear-host-user-contaminated.patch b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-seco/imx-seco-libs/0002-Makefile-Fix-install-to-clear-host-user-contaminated.patch deleted file mode 100644 index 67eec7164..000000000 --- a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-seco/imx-seco-libs/0002-Makefile-Fix-install-to-clear-host-user-contaminated.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 99249f0f199d95f4a5213561dc0ce33f70b1e717 Mon Sep 17 00:00:00 2001 -From: Cristinel Panfir -Date: Mon, 29 Mar 2021 15:20:55 +0300 -Subject: [PATCH] Makefile: Fix install to clear host-user-contaminated - warnings [HSM-483] - -WARNING: imx-seco-libs-git-r0 do_package_qa: QA Issue: -imx-seco-libs: /usr/lib/hsm_lib.a is owned by uid 26292, which is the same as the user running bitbake. This may be due to host contamination -imx-seco-libs: /usr/lib/she_lib.a is owned by uid 26292, which is the same as the user running bitbake. This may be due to host contamination -imx-seco-libs: /usr/lib/seco_nvm_manager.a is owned by uid 26292, which is the same as the user running bitbake. -This may be due to host contamination [host-user-contaminated] - -Signed-off-by: Cristinel Panfir ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 492d700..25ad333 100644 ---- a/Makefile -+++ b/Makefile -@@ -63,7 +63,7 @@ hsm_doc: include/hsm/hsm_api.h - - install: hsm_test she_test she_lib.a seco_nvm_manager.a hsm_lib.a - mkdir -p $(DESTDIR)$(BINDIR) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(INCLUDEDIR) -- cp -a seco_nvm_manager.a hsm_lib.a she_lib.a $(DESTDIR)$(LIBDIR) -+ cp seco_nvm_manager.a hsm_lib.a she_lib.a $(DESTDIR)$(LIBDIR) - cp hsm_test she_test $(DESTDIR)$(BINDIR) - cp -a include/* $(DESTDIR)$(INCLUDEDIR) - --- -2.25.1 - diff --git a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-seco/imx-seco-libs_git.bb b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-seco/imx-seco-libs_git.bb deleted file mode 100644 index 0bce35a16..000000000 --- a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-seco/imx-seco-libs_git.bb +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 2019-21 NXP - -SUMMARY = "NXP i.MX SECO library" -DESCRIPTION = "NXP IMX SECO library" -SECTION = "base" -LICENSE = "Proprietary" -LIC_FILES_CHKSUM = "file://EULA.txt;md5=76871788f27c28af824e2ec1ca187832" - -DEPENDS = "zlib" - -SRCBRANCH = "lf-5.10.72_2.2.0" -SECO_LIB_SRC ?= "git://github.com/NXP/imx-seco-libs.git;protocol=https" -SRC_URI = "${SECO_LIB_SRC};branch=${SRCBRANCH} \ - file://0001-Makefile-Fix-LIBDIR-for-multilib.patch \ - file://0002-Makefile-Fix-install-to-clear-host-user-contaminated.patch \ - file://0001-add-v2x_test-to-the-installed-binaries.patch \ -" -SRCREV = "3e8ad6b168f23a8c6ecd75edabc18d2673403e24" - -S = "${WORKDIR}/git" - -TARGET_CC_ARCH += "${LDFLAGS}" - -do_install () { - oe_runmake DESTDIR=${D} install - chown -R root:root "${D}" -} - -COMPATIBLE_MACHINE = "(mx8-nxp-bsp)" -COMPATIBLE_MACHINE:mx8m-nxp-bsp = "(^$)" diff --git a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-seco/imx-seco_3.8.4.bb b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-seco/imx-seco_3.8.4.bb deleted file mode 100644 index e8463473b..000000000 --- a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-seco/imx-seco_3.8.4.bb +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 2019-2021 NXP - -SUMMARY = "NXP i.MX SECO firmware" -DESCRIPTION = "NXP IMX SECO firmware" -SECTION = "base" -LICENSE = "Proprietary" - -LIC_FILES_CHKSUM = "file://COPYING;md5=03bcadc8dc0a788f66ca9e2b89f56c6f" - -inherit fsl-eula-unpack use-imx-security-controller-firmware deploy - -SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true" - -SRC_URI[md5sum] = "38d298cda9ea91db945b266bd6774e07" -SRC_URI[sha256sum] = "ed65381fac7a17a7594099191952821ed3f3f54c944937926dc19f82ecd8fef5" - -do_compile[noexec] = "1" -do_install() { -} - -addtask deploy after do_install -do_deploy () { - # Deploy i.MX8 SECO firmware files - install -m 0644 ${S}/firmware/seco/${SECO_FIRMWARE_NAME} ${DEPLOYDIR} -} - -COMPATIBLE_MACHINE = "(mx8-nxp-bsp)" -COMPATIBLE_MACHINE:mx8m-nxp-bsp = "(^$)" diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/imx-parser/imx-parser.inc b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/imx-parser/imx-parser.inc deleted file mode 100644 index 75d23c28a..000000000 --- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/imx-parser/imx-parser.inc +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright (C) 2012-2014, 2016 O.S. Systems Software LTDA. -# Copyright (C) 2012-2016 Freescale Semiconductor -# Released under the MIT license (see COPYING.MIT for the terms) -DESCRIPTION = "Freescale Multimedia parser libs" -LICENSE = "Proprietary" -SECTION = "multimedia" -LIC_FILES_CHKSUM = "file://COPYING;md5=6b552f505eedab4a11ab538cf3db743a" - -# For backwards compatibility -PROVIDES += "libfslparser" -RREPLACES:${PN} = "libfslparser" -RPROVIDES:${PN} = "libfslparser" -RCONFLICTS:${PN} = "libfslparser" - -inherit fsl-eula-unpack autotools pkgconfig - -SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true" - -# Choose between 32bit and 64bit binaries -EXTRA_OECONF = "${@bb.utils.contains('TUNE_FEATURES', 'aarch64', '--enable-armv8', \ - bb.utils.contains('TUNE_FEATURES', 'callconvention-hard', '--enable-fhw', '--enable-fsw', d), d)}" - -INHIBIT_PACKAGE_STRIP = "1" -INHIBIT_PACKAGE_DEBUG_SPLIT = "1" - -python __set_insane_skip() { - # FIXME: All binaries lack GNU_HASH in elf binary but as we don't have - # the source we cannot fix it. Disable the insane check for now. - # FIXME: gst-fsl-plugin looks for the .so files so we need to deploy those - for p in d.getVar('PACKAGES', True).split(): - d.setVar("INSANE_SKIP:%s" % p, "ldflags dev-so textrel") -} - -do_package_qa[prefuncs] += "__set_insane_skip" - -# FIXME: gst-fsl-plugin looks for the .so files so we need to deploy those -FILES:${PN} += "${libdir}/imx-mm/*/*${SOLIBS} ${libdir}/imx-mm/*/*${SOLIBSDEV}" - - -INHIBIT_SYSROOT_STRIP = "1" diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/imx-parser/imx-parser_4.6.3.bb b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/imx-parser/imx-parser_4.6.3.bb deleted file mode 100644 index 22e5e007f..000000000 --- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/imx-parser/imx-parser_4.6.3.bb +++ /dev/null @@ -1,12 +0,0 @@ -# Copyright (C) 2013-2016 Freescale Semiconductor -# Copyright 2017-2021 NXP -# Released under the MIT license (see COPYING.MIT for the terms) - -include imx-parser.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=03bcadc8dc0a788f66ca9e2b89f56c6f" - -SRC_URI[md5sum] = "7e6cf19ac1c5f7227bceac794fd72651" -SRC_URI[sha256sum] = "780b211b26b15f1a0fc29b4e9c662d075f9478ca8a67d653a5d263086dd34eef" - -COMPATIBLE_MACHINE = "(mx6-nxp-bsp|mx7-nxp-bsp|mx8-nxp-bsp)"