From fbe056ca0c31a7dc60645914046fc817490f2000 Mon Sep 17 00:00:00 2001 From: Abdellatif El Khlifi Date: Mon, 25 Oct 2021 16:42:05 +0100 Subject: [PATCH] arm/fiptool-native: bumping the version to v2.5 The commit provides the v2.5 recipe for fiptool-native and removes the older versions. Change-Id: Ie87ca97bc63bfe7ba2337b1bf05d9658921bab83 Signed-off-by: Abdellatif El Khlifi Signed-off-by: Jon Mason --- .../fiptool/fiptool-native_1.5.bb | 31 ------------------- ...ol-native_2.3.bb => fiptool-native_2.5.bb} | 9 +++--- 2 files changed, 4 insertions(+), 36 deletions(-) delete mode 100644 meta-arm/recipes-devtools/fiptool/fiptool-native_1.5.bb rename meta-arm/recipes-devtools/fiptool/{fiptool-native_2.3.bb => fiptool-native_2.5.bb} (73%) diff --git a/meta-arm/recipes-devtools/fiptool/fiptool-native_1.5.bb b/meta-arm/recipes-devtools/fiptool/fiptool-native_1.5.bb deleted file mode 100644 index 925542c8..00000000 --- a/meta-arm/recipes-devtools/fiptool/fiptool-native_1.5.bb +++ /dev/null @@ -1,31 +0,0 @@ -# Firmware Image Package (FIP) -# It is a packaging format used by TF-A to package the -# firmware images in a single binary. - -DESCRIPTION = "fiptool - Trusted Firmware tool for packaging" -LICENSE = "BSD-3-Clause" - -SRC_URI = "git://git.trustedfirmware.org/TF-A/trusted-firmware-a.git;protocol=https" -LIC_FILES_CHKSUM = "file://license.rst;md5=e927e02bca647e14efd87e9e914b2443" - -# Use fiptool from TF-A v1.5 -SRCREV = "ed8112606c54d85781fc8429160883d6310ece32" - -DEPENDS += "openssl-native" - -inherit native - -S = "${WORKDIR}/git" - -do_compile () { - # These changes are needed to have the fiptool compiling and executing properly - sed -i '/^LDLIBS/ s,$, \$\{BUILD_LDFLAGS},' ${S}/tools/fiptool/Makefile - sed -i '/^INCLUDE_PATHS/ s,$, \$\{BUILD_CFLAGS},' ${S}/tools/fiptool/Makefile - - oe_runmake fiptool -} - -do_install () { - install -d ${D}${bindir}/ - install -m 0755 tools/fiptool/fiptool ${D}${bindir} -} diff --git a/meta-arm/recipes-devtools/fiptool/fiptool-native_2.3.bb b/meta-arm/recipes-devtools/fiptool/fiptool-native_2.5.bb similarity index 73% rename from meta-arm/recipes-devtools/fiptool/fiptool-native_2.3.bb rename to meta-arm/recipes-devtools/fiptool/fiptool-native_2.5.bb index 25ca111e..2d0f333a 100644 --- a/meta-arm/recipes-devtools/fiptool/fiptool-native_2.3.bb +++ b/meta-arm/recipes-devtools/fiptool/fiptool-native_2.5.bb @@ -6,10 +6,10 @@ DESCRIPTION = "fiptool - Trusted Firmware tool for packaging" LICENSE = "BSD-3-Clause" SRC_URI = "git://git.trustedfirmware.org/TF-A/trusted-firmware-a.git;destsuffix=fiptool-${PV};protocol=https;" -LIC_FILES_CHKSUM = "file://docs/license.rst;md5=189505435dbcdcc8caa63c46fe93fa89" +LIC_FILES_CHKSUM = "file://docs/license.rst;md5=713afe122abbe07f067f939ca3c480c5" -# Use fiptool from TF-A v2.3 -SRCREV = "ecd27ad85f1eba29f6bf92c39dc002c85b07dad5" +# Use fiptool from TF-A v2.5 +SRCREV = "c158878249f1bd930906ebd744b90d3f2a8265f1" DEPENDS += "openssl-native" @@ -24,6 +24,5 @@ do_compile () { } do_install () { - install -d ${D}${bindir}/ - install -m 0755 tools/fiptool/fiptool ${D}${bindir} + install -D -p -m 0755 tools/fiptool/fiptool ${D}${bindir}/fiptool }