mirror of
https://git.yoctoproject.org/poky
synced 2026-09-14 03:49:32 +02:00
u-boot: Fix u-boot signing when building with multiple u-boot configs
The prepended code with the i and j variables clash with similar code in uboot.inc, so they need to be unset once we are done using them.
This commit fixes the issue that was introduced in d6858c9 "u-boot: Rework signing to remove interdependencies".
(From OE-Core rev: 6f668f85d7e5b0a9d36198db865cf1e1a012b2e1)
Signed-off-by: David Bagonyi <david.bagonyi@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
bab3b86766
commit
935fbe5e47
@@ -149,7 +149,7 @@ deploy_dtb() {
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -f "${UBOOT_NODTB_BINARY}" ]; then
|
if [ -f "${UBOOT_NODTB_BINARY}" ]; then
|
||||||
install -Dm644 ${UBOOT_DTB_BINARY} ${DEPLOYDIR}/${uboot_nodtb_binary}
|
install -Dm644 ${UBOOT_NODTB_BINARY} ${DEPLOYDIR}/${uboot_nodtb_binary}
|
||||||
if [ -n "${type}" ]; then
|
if [ -n "${type}" ]; then
|
||||||
ln -sf ${uboot_nodtb_binary} ${DEPLOYDIR}/${UBOOT_NODTB_IMAGE}
|
ln -sf ${uboot_nodtb_binary} ${DEPLOYDIR}/${UBOOT_NODTB_IMAGE}
|
||||||
fi
|
fi
|
||||||
@@ -407,7 +407,9 @@ do_deploy:prepend() {
|
|||||||
deploy_helper ${type}
|
deploy_helper ${type}
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
unset j
|
||||||
done
|
done
|
||||||
|
unset i
|
||||||
else
|
else
|
||||||
cd ${B}
|
cd ${B}
|
||||||
deploy_helper ""
|
deploy_helper ""
|
||||||
|
|||||||
Reference in New Issue
Block a user