summaryrefslogtreecommitdiffstats
path: root/meta/classes/uboot-sign.bbclass
diff options
context:
space:
mode:
authorJun Nie <jun.nie@linaro.org>2019-07-10 07:10:56 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-07-18 11:16:19 (GMT)
commitf1cd5b9b532db86db8d5f2e6e04a1d0b6bec2699 (patch)
treeb6467960dae5dcac17bf866277495ffe61dd5002 /meta/classes/uboot-sign.bbclass
parentedab4b2cecf502a672cc39a8796e60e2fd25cc1c (diff)
downloadpoky-f1cd5b9b532db86db8d5f2e6e04a1d0b6bec2699.tar.gz
kernel-fitimage: uboot-sign: fix missing signature
u-boot.bin with dtb & signature should be placed in ${B} so that it can be deployed by u-boot as expected. Otherwise, the version without signature is installed. (From OE-Core rev: bfc8c964a9760a2c4a1d1902918908a1e7361c17) Signed-off-by: Jun Nie <jun.nie@linaro.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/uboot-sign.bbclass')
-rw-r--r--meta/classes/uboot-sign.bbclass4
1 files changed, 3 insertions, 1 deletions
diff --git a/meta/classes/uboot-sign.bbclass b/meta/classes/uboot-sign.bbclass
index de81ad1..982ed46 100644
--- a/meta/classes/uboot-sign.bbclass
+++ b/meta/classes/uboot-sign.bbclass
@@ -66,7 +66,7 @@ concat_dtb_helper() {
66 install ${UBOOT_BINARY} ${DEPLOYDIR}/${UBOOT_IMAGE} 66 install ${UBOOT_BINARY} ${DEPLOYDIR}/${UBOOT_IMAGE}
67 elif [ -e "${DEPLOYDIR}/${UBOOT_NODTB_IMAGE}" -a -e "$deployed_uboot_dtb_binary" ]; then 67 elif [ -e "${DEPLOYDIR}/${UBOOT_NODTB_IMAGE}" -a -e "$deployed_uboot_dtb_binary" ]; then
68 cd ${DEPLOYDIR} 68 cd ${DEPLOYDIR}
69 cat ${UBOOT_NODTB_IMAGE} $deployed_uboot_dtb_binary | tee ${UBOOT_BINARY} > ${UBOOT_IMAGE} 69 cat ${UBOOT_NODTB_IMAGE} $deployed_uboot_dtb_binary | tee ${B}/${CONFIG_B_PATH}/${UBOOT_BINARY} > ${UBOOT_IMAGE}
70 else 70 else
71 bbwarn "Failure while adding public key to u-boot binary. Verified boot won't be available." 71 bbwarn "Failure while adding public key to u-boot binary. Verified boot won't be available."
72 fi 72 fi
@@ -77,10 +77,12 @@ concat_dtb() {
77 mkdir -p ${DEPLOYDIR} 77 mkdir -p ${DEPLOYDIR}
78 if [ -n "${UBOOT_CONFIG}" ]; then 78 if [ -n "${UBOOT_CONFIG}" ]; then
79 for config in ${UBOOT_MACHINE}; do 79 for config in ${UBOOT_MACHINE}; do
80 CONFIG_B_PATH="${config}"
80 cd ${B}/${config} 81 cd ${B}/${config}
81 concat_dtb_helper 82 concat_dtb_helper
82 done 83 done
83 else 84 else
85 CONFIG_B_PATH=""
84 cd ${B} 86 cd ${B}
85 concat_dtb_helper 87 concat_dtb_helper
86 fi 88 fi