[oe-commits] Carlos Rafael Giani : u-boot.inc: make sure all counter variables are properly unset
git at git.openembedded.org
git at git.openembedded.org
Fri Apr 24 10:08:32 UTC 2015
Module: openembedded-core.git
Branch: master
Commit: 50233dc2544fe8eeee69a5dc07f505db29fc9e0e
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=50233dc2544fe8eeee69a5dc07f505db29fc9e0e
Author: Carlos Rafael Giani <dv at pseudoterminal.org>
Date: Mon Apr 20 21:17:08 2015 +0200
u-boot.inc: make sure all counter variables are properly unset
The script does "i == j" checks to retrieve the config <-> type pairs from
the UBOOT_MACHINE and UBOOT_CONFIG lists. This check however requires both
j and i to be initially unset. Ensure this by explicitely unsetting i.
This fixes broken u-boot SPL installations with SolidRun machines
(the SPL wasn't being installed and deployed.)
Signed-off-by: Carlos Rafael Giani <dv at pseudoterminal.org>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
meta/recipes-bsp/u-boot/u-boot.inc | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc
index 7053a56..88e239d 100644
--- a/meta/recipes-bsp/u-boot/u-boot.inc
+++ b/meta/recipes-bsp/u-boot/u-boot.inc
@@ -78,6 +78,7 @@ do_compile () {
done
unset j
done
+ unset i
else
oe_runmake ${UBOOT_MACHINE}
oe_runmake ${UBOOT_MAKE_TARGET}
@@ -101,6 +102,7 @@ do_install () {
done
unset j
done
+ unset i
else
install -d ${D}/boot
install ${S}/${UBOOT_BINARY} ${D}/boot/${UBOOT_IMAGE}
@@ -129,6 +131,7 @@ do_install () {
done
unset j
done
+ unset i
else
install ${S}/${SPL_BINARY} ${D}/boot/${SPL_IMAGE}
ln -sf ${SPL_IMAGE} ${D}/boot/${SPL_BINARY}
@@ -162,6 +165,7 @@ do_deploy () {
done
unset j
done
+ unset i
else
install -d ${DEPLOYDIR}
install ${S}/${UBOOT_BINARY} ${DEPLOYDIR}/${UBOOT_IMAGE}
@@ -193,6 +197,7 @@ do_deploy () {
done
unset j
done
+ unset i
else
install ${S}/${SPL_BINARY} ${DEPLOYDIR}/${SPL_IMAGE}
rm -f ${DEPLOYDIR}/${SPL_BINARY} ${DEPLOYDIR}/${SPL_SYMLINK}
More information about the Openembedded-commits
mailing list