From b1776fcc63a83f538ec3a32c644a474f30de4215 Mon Sep 17 00:00:00 2001 From: Hector Palacios Date: Tue, 11 Feb 2020 18:45:17 +0100 Subject: [PATCH] trustfence-sign-kernel.sh: don't generate SRK_efuses for DEY sign script The only script that needs to generate the SRK_efuses is the sign.sh script in the U-Boot code. For the rest of signed non-bootable artifacts this is not required and it was creating the SRK_efuses file on every recipe where the script was called, like linux-dey and others, which eventually resulted in a conflict when copying the artifacts to the shared deploy-image-dir. Signed-off-by: Hector Palacios --- .../trustfence-sign-tools/trustfence-sign-kernel.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools/trustfence-sign-kernel.sh b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools/trustfence-sign-kernel.sh index ad5cce588..bdba4933a 100755 --- a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools/trustfence-sign-kernel.sh +++ b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools/trustfence-sign-kernel.sh @@ -171,7 +171,6 @@ if [ "${CONFIG_SIGN_MODE}" = "HAB" ]; then HAB_VER="hab_ver 4" DIGEST="digest" DIGEST_ALGO="sha256" - SRK_EFUSES="/dev/null" # Other constants GAP_FILLER="0x00" @@ -243,8 +242,6 @@ if [ "${CONFIG_SIGN_MODE}" = "HAB" ]; then "${SCRIPT_PATH}/csf_templates/sign_hab" > csf_descriptor fi else - SRK_EFUSES="$(pwd)/SRK_efuses.bin" - # Other constants KERNEL_START_OFFSET="0x0" KERNEL_SIG_BLOCK_OFFSET="0x90" @@ -275,7 +272,7 @@ else fi # Generate SRK tables -srktool --${HAB_VER} --certs "${SRK_KEYS}" --table "${SRK_TABLE}" --efuses "${SRK_EFUSES}" --${DIGEST} "${DIGEST_ALGO}" +srktool --${HAB_VER} --certs "${SRK_KEYS}" --table "${SRK_TABLE}" --efuses /dev/null --${DIGEST} "${DIGEST_ALGO}" if [ $? -ne 0 ]; then echo "[ERROR] Could not generate SRK tables" exit 1