From 0095d8c415c2485c49e6b3d8fd4ad1b4e5b613ac Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Tue, 16 Feb 2021 14:16:35 +0100 Subject: [PATCH] imx-seco: Update recipes to new NXP BSP release imx_5.4.70_2.3.1 Update imx-seco to v3.7.5, update imx-seco-libs revision and add a new patch. Signed-off-by: Gabriel Valcazar --- ...001-Makefile-Fix-LIBDIR-for-multilib.patch | 2 +- ...tall-to-clear-host-user-contaminated.patch | 33 +++++++++++++++++++ .../recipes-bsp/imx-seco/imx-seco-libs_git.bb | 5 +-- .../{imx-seco_3.7.4.bb => imx-seco_3.7.5.bb} | 4 +-- 4 files changed, 39 insertions(+), 5 deletions(-) create mode 100644 meta-digi-arm/recipes-bsp/imx-seco/imx-seco-libs/0002-Makefile-Fix-install-to-clear-host-user-contaminated.patch rename meta-digi-arm/recipes-bsp/imx-seco/{imx-seco_3.7.4.bb => imx-seco_3.7.5.bb} (80%) diff --git a/meta-digi-arm/recipes-bsp/imx-seco/imx-seco-libs/0001-Makefile-Fix-LIBDIR-for-multilib.patch b/meta-digi-arm/recipes-bsp/imx-seco/imx-seco-libs/0001-Makefile-Fix-LIBDIR-for-multilib.patch index d1784e255..772b6610b 100644 --- a/meta-digi-arm/recipes-bsp/imx-seco/imx-seco-libs/0001-Makefile-Fix-LIBDIR-for-multilib.patch +++ b/meta-digi-arm/recipes-bsp/imx-seco/imx-seco-libs/0001-Makefile-Fix-LIBDIR-for-multilib.patch @@ -12,7 +12,7 @@ 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 sm_lib.a +@@ -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 diff --git a/meta-digi-arm/recipes-bsp/imx-seco/imx-seco-libs/0002-Makefile-Fix-install-to-clear-host-user-contaminated.patch b/meta-digi-arm/recipes-bsp/imx-seco/imx-seco-libs/0002-Makefile-Fix-install-to-clear-host-user-contaminated.patch new file mode 100644 index 000000000..7988cdaea --- /dev/null +++ b/meta-digi-arm/recipes-bsp/imx-seco/imx-seco-libs/0002-Makefile-Fix-install-to-clear-host-user-contaminated.patch @@ -0,0 +1,33 @@ +From 59608dcb0f0a6f6d8154b1d331c2403d7c1143eb Mon Sep 17 00:00:00 2001 +From: Cristinel Panfir +Date: Fri, 5 Feb 2021 19:27:00 +0200 +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/recipes-bsp/imx-seco/imx-seco-libs_git.bb b/meta-digi-arm/recipes-bsp/imx-seco/imx-seco-libs_git.bb index 60bd483c8..6091952f7 100644 --- a/meta-digi-arm/recipes-bsp/imx-seco/imx-seco-libs_git.bb +++ b/meta-digi-arm/recipes-bsp/imx-seco/imx-seco-libs_git.bb @@ -8,12 +8,13 @@ LIC_FILES_CHKSUM = "file://EULA.txt;md5=228c72f2a91452b8a03c4cab30f30ef9" DEPENDS = "zlib" -SRCBRANCH = "imx_5.4.70_2.3.0" +SRCBRANCH = "imx_5.4.70_2.3.1" 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 \ " -SRCREV = "b730ba5975644094f224faee20942f63d0d24ccd" +SRCREV = "79e5fb5d096c61b1c3163c9fa8e42719509d95a0" S = "${WORKDIR}/git" diff --git a/meta-digi-arm/recipes-bsp/imx-seco/imx-seco_3.7.4.bb b/meta-digi-arm/recipes-bsp/imx-seco/imx-seco_3.7.5.bb similarity index 80% rename from meta-digi-arm/recipes-bsp/imx-seco/imx-seco_3.7.4.bb rename to meta-digi-arm/recipes-bsp/imx-seco/imx-seco_3.7.5.bb index 2b7441d6e..f6e9bad83 100644 --- a/meta-digi-arm/recipes-bsp/imx-seco/imx-seco_3.7.4.bb +++ b/meta-digi-arm/recipes-bsp/imx-seco/imx-seco_3.7.5.bb @@ -11,8 +11,8 @@ inherit fsl-eula-unpack deploy SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true" -SRC_URI[md5sum] = "f0e20216f27f2f44ac809634c5291be5" -SRC_URI[sha256sum] = "2ed8177e48c8e33f742b3a642805be56a5ef56df78b1b29e10518552154da2bc" +SRC_URI[md5sum] = "d4faca131abfc51a1dd0278d7d201159" +SRC_URI[sha256sum] = "08cf25a4be6841ca7264a50b29c311b386eae1c02fced8a3b55fd04213acb4bc" do_compile[noexec] = "1"