It is late here so I will it along with other tests in master tomorrow before acking it.
On Sun, Mar 15, 2015 at 11:06 PM, [email protected] <[email protected]> wrote: > Pings. > > -----Original Message----- > From: Chunrong Guo [mailto:[email protected]] > Sent: Wednesday, March 11, 2015 5:40 PM > To: [email protected] > Cc: Liu Ting-B28495; Luo Zhenhua-B19537; Guo Chunrong-B40290; Guo > Chunrong-B40290 > Subject: [OE-core][PATCH v4] u-boot.inc: fix rename image error > > Resolve mismatch between U-Boot configs and uboot image name. > The ${S}/${config}/u-boot-${type}.${UBOOT_SUFFIX} may alway be false > and repeat compile or install so we need to check if ${type} match > ${config} . > > Signed-off-by: Chunrong Guo <[email protected]> > --- > meta/recipes-bsp/u-boot/u-boot.inc | 85 > ++++++++++++++++---------------------- > 1 file changed, 35 insertions(+), 50 deletions(-) > > diff --git a/meta/recipes-bsp/u-boot/u-boot.inc > b/meta/recipes-bsp/u-boot/u-boot.inc > index 6bdc86a..9b52971 100644 > --- a/meta/recipes-bsp/u-boot/u-boot.inc > +++ b/meta/recipes-bsp/u-boot/u-boot.inc > @@ -66,20 +66,17 @@ do_compile () { > if [ "x${UBOOT_CONFIG}" != "x" ] > then > for config in ${UBOOT_MACHINE}; do > - for type in in ${UBOOT_CONFIG}; do > - if [ "${type}"x = "in"x ] > + i=`expr $i + 1`; > + for type in ${UBOOT_CONFIG}; do > + j=`expr $j + 1`; > + if [ $j -eq $i ] > then > - continue > - fi > - if [ -d "${S}/${config}/u-boot-${type}.${UBOOT_SUFFIX}" ] > - then > - break > - else > oe_runmake O=${config} ${config} > oe_runmake O=${config} ${UBOOT_MAKE_TARGET} > cp ${S}/${config}/${UBOOT_BINARY} > ${S}/${config}/u-boot-${type}.${UBOOT_SUFFIX} > fi > done > + unset j > done > else > oe_runmake ${UBOOT_MACHINE} > @@ -92,20 +89,17 @@ do_install () { > if [ "x${UBOOT_CONFIG}" != "x" ] > then > for config in ${UBOOT_MACHINE}; do > - for type in in ${UBOOT_CONFIG}; do > - if [ "${type}"x = "in"x ] > - then > - continue > - fi > - if [ -d "${D}/boot/u-boot-${type}.${UBOOT_SUFFIX}" ] > + i=`expr $i + 1`; > + for type in ${UBOOT_CONFIG}; do > + j=`expr $j + 1`; > + if [ $j -eq $i ] > then > - break > - else > install -d ${D}/boot > install ${S}/${config}/u-boot-${type}.${UBOOT_SUFFIX} > ${D}/boot/u-boot-${type}.${UBOOT_SUFFIX} > ln -sf u-boot-${type}.${UBOOT_SUFFIX} > ${D}/boot/${UBOOT_BINARY} > fi > done > + unset j > done > else > install -d ${D}/boot > @@ -123,20 +117,17 @@ do_install () { > if [ "x${UBOOT_CONFIG}" != "x" ] > then > for config in ${UBOOT_MACHINE}; do > - for type in in ${UBOOT_CONFIG}; do > - if [ "${type}"x = "in"x ] > - then > - continue > - fi > - if [ -d "${D}/boot/${SPL_IMAGE}-${type}" ] > - then > - break > - else > + i=`expr $i + 1`; > + for type in ${UBOOT_CONFIG}; do > + j=`expr $j + 1`; > + if [ $j -eq $i ] > + then > install ${S}/${config}/${SPL_BINARY} > ${D}/boot/${SPL_IMAGE}-${type} > ln -sf ${SPL_IMAGE}-${type} > ${D}/boot/${SPL_BINARY}-${type} > ln -sf ${SPL_IMAGE}-${type} ${D}/boot/${SPL_BINARY} > - fi > + fi > done > + unset j > done > else > install ${S}/${SPL_BINARY} ${D}/boot/${SPL_IMAGE} @@ -157,15 > +148,11 @@ do_deploy () { > if [ "x${UBOOT_CONFIG}" != "x" ] > then > for config in ${UBOOT_MACHINE}; do > - for type in in ${UBOOT_CONFIG}; do > - if [ "${type}"x = "in"x ] > + i=`expr $i + 1`; > + for type in ${UBOOT_CONFIG}; do > + j=`expr $j + 1`; > + if [ $j -eq $i ] > then > - continue > - fi > - if [ -d "${DEPLOYDIR}/u-boot-${type}.${UBOOT_SUFFIX}" ] > - then > - break > - else > install -d ${DEPLOYDIR} > install ${S}/${config}/u-boot-${type}.${UBOOT_SUFFIX} > ${DEPLOYDIR}/u-boot-${type}.${UBOOT_SUFFIX} > cd ${DEPLOYDIR} > @@ -173,6 +160,7 @@ do_deploy () { > ln -sf u-boot-${type}.${UBOOT_SUFFIX} ${UBOOT_BINARY} > fi > done > + unset j > done > else > install -d ${DEPLOYDIR} > @@ -190,23 +178,20 @@ do_deploy () { > if [ "x${UBOOT_CONFIG}" != "x" ] > then > for config in ${UBOOT_MACHINE}; do > - for type in in ${UBOOT_CONFIG}; do > - if [ "${type}"x = "in"x ] > - then > - continue > - fi > - if [ -d "${DEPLOYDIR}/${SPL_IMAGE}-${type}" ] > - then > - break > - else > - install ${S}/${config}/${SPL_BINARY} > ${DEPLOYDIR}/${SPL_IMAGE}-${type} > - rm -f ${DEPLOYDIR}/${SPL_BINARY} > ${DEPLOYDIR}/${SPL_SYMLINK}-${type} > - ln -sf ${SPL_IMAGE}-${type} > ${DEPLOYDIR}/${SPL_BINARY}-${type} > - ln -sf ${SPL_IMAGE}-${type} > ${DEPLOYDIR}/${SPL_BINARY} > - ln -sf ${SPL_IMAGE}-${type} > ${DEPLOYDIR}/${SPL_SYMLINK}-${type} > - ln -sf ${SPL_IMAGE}-${type} > ${DEPLOYDIR}/${SPL_SYMLINK} > - fi > + i=`expr $i + 1`; > + for type in ${UBOOT_CONFIG}; do > + j=`expr $j + 1`; > + if [ $j -eq $i ] > + then > + install ${S}/${config}/${SPL_BINARY} > ${DEPLOYDIR}/${SPL_IMAGE}-${type} > + rm -f ${DEPLOYDIR}/${SPL_BINARY} > ${DEPLOYDIR}/${SPL_SYMLINK}-${type} > + ln -sf ${SPL_IMAGE}-${type} > ${DEPLOYDIR}/${SPL_BINARY}-${type} > + ln -sf ${SPL_IMAGE}-${type} > ${DEPLOYDIR}/${SPL_BINARY} > + ln -sf ${SPL_IMAGE}-${type} > ${DEPLOYDIR}/${SPL_SYMLINK}-${type} > + ln -sf ${SPL_IMAGE}-${type} > ${DEPLOYDIR}/${SPL_SYMLINK} > + fi > done > + unset j > done > else > install ${S}/${SPL_BINARY} ${DEPLOYDIR}/${SPL_IMAGE} > -- > 1.9.2 > > -- > _______________________________________________ > Openembedded-core mailing list > [email protected] > http://lists.openembedded.org/mailman/listinfo/openembedded-core -- Otavio Salvador O.S. Systems http://www.ossystems.com.br http://code.ossystems.com.br Mobile: +55 (53) 9981-7854 Mobile: +1 (347) 903-9750 -- _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
