Re: [meta-ti] [master][PATCH] u-boot-ti-staging: fix B != S and python3 issues

2016-10-18 Thread Gary Thomas 

On 2016-10-18 19:04, Denys Dmytriyenko wrote:

From: Denys Dmytriyenko 

Signed-off-by: Denys Dmytriyenko 

Acked-by: Gary Thomas 


---
 recipes-bsp/u-boot/u-boot-ti-staging_2016.05.bb | 36 -
 recipes-bsp/u-boot/u-boot-ti.inc|  6 ++---
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/recipes-bsp/u-boot/u-boot-ti-staging_2016.05.bb 
b/recipes-bsp/u-boot/u-boot-ti-staging_2016.05.bb
index 38f58f7..2b85800 100644
--- a/recipes-bsp/u-boot/u-boot-ti-staging_2016.05.bb
+++ b/recipes-bsp/u-boot/u-boot-ti-staging_2016.05.bb
@@ -7,7 +7,7 @@ DESCRIPTION = "u-boot bootloader for TI devices"

 LIC_FILES_CHKSUM = 
"file://Licenses/README;md5=a2c678cfd4a4d97135585cad908541c6"

-PR = "r21"
+PR = "r22"
 PV_append = "+git${SRCPV}"

 SRC_URI = 
"git://git.ti.com/ti-u-boot/ti-u-boot.git;protocol=git;branch=${BRANCH}"
@@ -52,32 +52,32 @@ UBOOT_HS_MLO_IMAGE = "u-boot_HS_MLO-${MACHINE}-${PV}-${PR}"
 UBOOT_HS_MLO_SYMLINK = "u-boot_HS_MLO-${MACHINE}"

 do_compile_append_am437x-hs-evm () {
-   if [ -f ${S}/u-boot-spl_HS_ISSW ]; then
-   rm -rf ${S}/MLO
-   cp ${S}/u-boot-spl_HS_ISSW ${S}/MLO
+   if [ -f ${B}/u-boot-spl_HS_ISSW ]; then
+   rm -rf ${B}/MLO
+   cp ${B}/u-boot-spl_HS_ISSW ${B}/MLO
fi
 }

 do_install_append () {
-   if [ -f ${S}/${UBOOT_HS_XLD_BINARY} ]; then
-   install ${S}/${UBOOT_HS_XLD_BINARY} 
${D}/boot/${UBOOT_HS_XLD_IMAGE}
+   if [ -f ${B}/${UBOOT_HS_XLD_BINARY} ]; then
+   install ${B}/${UBOOT_HS_XLD_BINARY} 
${D}/boot/${UBOOT_HS_XLD_IMAGE}
ln -sf ${UBOOT_HS_XLD_IMAGE} ${D}/boot/${UBOOT_HS_XLD_BINARY}
fi
-   if [ -f ${S}/${UBOOT_HS_MLO_BINARY} ]; then
-   install ${S}/${UBOOT_HS_MLO_BINARY} 
${D}/boot/${UBOOT_HS_MLO_IMAGE}
+   if [ -f ${B}/${UBOOT_HS_MLO_BINARY} ]; then
+   install ${B}/${UBOOT_HS_MLO_BINARY} 
${D}/boot/${UBOOT_HS_MLO_IMAGE}
ln -sf ${UBOOT_HS_MLO_IMAGE} ${D}/boot/${UBOOT_HS_MLO_BINARY}
fi
 }

 do_deploy_append () {
-   if [ -f ${S}/${UBOOT_HS_XLD_BINARY} ]; then
-   install ${S}/${UBOOT_HS_XLD_BINARY} 
${DEPLOYDIR}/${UBOOT_HS_XLD_IMAGE}
+   if [ -f ${B}/${UBOOT_HS_XLD_BINARY} ]; then
+   install ${B}/${UBOOT_HS_XLD_BINARY} 
${DEPLOYDIR}/${UBOOT_HS_XLD_IMAGE}
rm -f ${UBOOT_HS_XLD_BINARY} ${UBOOT_HS_XLD_SYMLINK}
ln -sf ${UBOOT_HS_XLD_IMAGE} ${UBOOT_HS_XLD_SYMLINK}
ln -sf ${UBOOT_HS_XLD_IMAGE} ${UBOOT_HS_XLD_BINARY}
fi
-   if [ -f ${S}/${UBOOT_HS_MLO_BINARY} ]; then
-   install ${S}/${UBOOT_HS_MLO_BINARY} 
${DEPLOYDIR}/${UBOOT_HS_MLO_IMAGE}
+   if [ -f ${B}/${UBOOT_HS_MLO_BINARY} ]; then
+   install ${B}/${UBOOT_HS_MLO_BINARY} 
${DEPLOYDIR}/${UBOOT_HS_MLO_IMAGE}
rm -f ${UBOOT_HS_MLO_BINARY} ${UBOOT_HS_MLO_SYMLINK}
ln -sf ${UBOOT_HS_MLO_IMAGE} ${UBOOT_HS_MLO_SYMLINK}
ln -sf ${UBOOT_HS_MLO_IMAGE} ${UBOOT_HS_MLO_BINARY}
@@ -85,28 +85,28 @@ do_deploy_append () {
 }

 do_install_append_keystone () {
-   install ${S}/spl/${UBOOT_SPI_SPL_BINARY} 
${D}/boot/${UBOOT_SPI_SPL_IMAGE}
+   install ${B}/spl/${UBOOT_SPI_SPL_BINARY} 
${D}/boot/${UBOOT_SPI_SPL_IMAGE}
ln -sf ${UBOOT_SPI_SPL_IMAGE} ${D}/boot/${UBOOT_SPI_SPL_BINARY}

-   install ${S}/${UBOOT_SPI_BINARY} ${D}/boot/${UBOOT_SPI_IMAGE}
+   install ${B}/${UBOOT_SPI_BINARY} ${D}/boot/${UBOOT_SPI_IMAGE}
ln -sf ${UBOOT_SPI_IMAGE} ${D}/boot/${UBOOT_SPI_BINARY}

-   install ${S}/${UBOOT_SPI_GPH_BINARY} ${D}/boot/${UBOOT_SPI_GPH_IMAGE}
+   install ${B}/${UBOOT_SPI_GPH_BINARY} ${D}/boot/${UBOOT_SPI_GPH_IMAGE}
ln -sf ${UBOOT_SPI_GPH_IMAGE} ${D}/boot/${UBOOT_SPI_GPH_BINARY}
 }

 do_deploy_append_keystone () {
-   install ${S}/spl/${UBOOT_SPI_SPL_BINARY} 
${DEPLOYDIR}/${UBOOT_SPI_SPL_IMAGE}
+   install ${B}/spl/${UBOOT_SPI_SPL_BINARY} 
${DEPLOYDIR}/${UBOOT_SPI_SPL_IMAGE}
rm -f ${UBOOT_SPI_SPL_BINARY} ${UBOOT_SPI_SPL_SYMLINK}
ln -sf ${UBOOT_SPI_SPL_IMAGE} ${UBOOT_SPI_SPL_SYMLINK}
ln -sf ${UBOOT_SPI_SPL_IMAGE} ${UBOOT_SPI_SPL_BINARY}

-   install ${S}/${UBOOT_SPI_BINARY} ${DEPLOYDIR}/${UBOOT_SPI_IMAGE}
+   install ${B}/${UBOOT_SPI_BINARY} ${DEPLOYDIR}/${UBOOT_SPI_IMAGE}
rm -f ${UBOOT_SPI_BINARY} ${UBOOT_SPI_SYMLINK}
ln -sf ${UBOOT_SPI_IMAGE} ${UBOOT_SPI_SYMLINK}
ln -sf ${UBOOT_SPI_IMAGE} ${UBOOT_SPI_BINARY}

-   install ${S}/${UBOOT_SPI_GPH_BINARY} ${DEPLOYDIR}/${UBOOT_SPI_GPH_IMAGE}
+   install ${B}/${UBOOT_SPI_GPH_BINARY} ${DEPLOYDIR}/${UBOOT_SPI_GPH_IMAGE}
rm -f ${UBOOT_SPI_GPH_BINARY} ${UBOOT_SPI_GPH_SYMLINK}
ln -sf ${UBOOT_SPI_GPH_IMAGE} ${UBOOT_SPI_GPH_SYMLINK}
ln -sf ${UBOOT_SPI_GPH_IMAGE} ${UBOOT_SPI_GPH_BINARY}
diff --git a/recipes-bsp/u-boot/u-boot-ti.inc b/recipes-bsp/u-boot/u-boot-ti.inc
index b0054c9..661f931 100644
-

[meta-ti] [master][PATCH] u-boot-ti-staging: fix B != S and python3 issues

2016-10-18 Thread Denys Dmytriyenko 
From: Denys Dmytriyenko 

Signed-off-by: Denys Dmytriyenko 
---
 recipes-bsp/u-boot/u-boot-ti-staging_2016.05.bb | 36 -
 recipes-bsp/u-boot/u-boot-ti.inc|  6 ++---
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/recipes-bsp/u-boot/u-boot-ti-staging_2016.05.bb 
b/recipes-bsp/u-boot/u-boot-ti-staging_2016.05.bb
index 38f58f7..2b85800 100644
--- a/recipes-bsp/u-boot/u-boot-ti-staging_2016.05.bb
+++ b/recipes-bsp/u-boot/u-boot-ti-staging_2016.05.bb
@@ -7,7 +7,7 @@ DESCRIPTION = "u-boot bootloader for TI devices"
 
 LIC_FILES_CHKSUM = 
"file://Licenses/README;md5=a2c678cfd4a4d97135585cad908541c6"
 
-PR = "r21"
+PR = "r22"
 PV_append = "+git${SRCPV}"
 
 SRC_URI = 
"git://git.ti.com/ti-u-boot/ti-u-boot.git;protocol=git;branch=${BRANCH}"
@@ -52,32 +52,32 @@ UBOOT_HS_MLO_IMAGE = "u-boot_HS_MLO-${MACHINE}-${PV}-${PR}"
 UBOOT_HS_MLO_SYMLINK = "u-boot_HS_MLO-${MACHINE}"
 
 do_compile_append_am437x-hs-evm () {
-   if [ -f ${S}/u-boot-spl_HS_ISSW ]; then
-   rm -rf ${S}/MLO
-   cp ${S}/u-boot-spl_HS_ISSW ${S}/MLO
+   if [ -f ${B}/u-boot-spl_HS_ISSW ]; then
+   rm -rf ${B}/MLO
+   cp ${B}/u-boot-spl_HS_ISSW ${B}/MLO
fi
 }
 
 do_install_append () {
-   if [ -f ${S}/${UBOOT_HS_XLD_BINARY} ]; then
-   install ${S}/${UBOOT_HS_XLD_BINARY} 
${D}/boot/${UBOOT_HS_XLD_IMAGE}
+   if [ -f ${B}/${UBOOT_HS_XLD_BINARY} ]; then
+   install ${B}/${UBOOT_HS_XLD_BINARY} 
${D}/boot/${UBOOT_HS_XLD_IMAGE}
ln -sf ${UBOOT_HS_XLD_IMAGE} ${D}/boot/${UBOOT_HS_XLD_BINARY}
fi
-   if [ -f ${S}/${UBOOT_HS_MLO_BINARY} ]; then
-   install ${S}/${UBOOT_HS_MLO_BINARY} 
${D}/boot/${UBOOT_HS_MLO_IMAGE}
+   if [ -f ${B}/${UBOOT_HS_MLO_BINARY} ]; then
+   install ${B}/${UBOOT_HS_MLO_BINARY} 
${D}/boot/${UBOOT_HS_MLO_IMAGE}
ln -sf ${UBOOT_HS_MLO_IMAGE} ${D}/boot/${UBOOT_HS_MLO_BINARY}
fi
 }
 
 do_deploy_append () {
-   if [ -f ${S}/${UBOOT_HS_XLD_BINARY} ]; then
-   install ${S}/${UBOOT_HS_XLD_BINARY} 
${DEPLOYDIR}/${UBOOT_HS_XLD_IMAGE}
+   if [ -f ${B}/${UBOOT_HS_XLD_BINARY} ]; then
+   install ${B}/${UBOOT_HS_XLD_BINARY} 
${DEPLOYDIR}/${UBOOT_HS_XLD_IMAGE}
rm -f ${UBOOT_HS_XLD_BINARY} ${UBOOT_HS_XLD_SYMLINK}
ln -sf ${UBOOT_HS_XLD_IMAGE} ${UBOOT_HS_XLD_SYMLINK}
ln -sf ${UBOOT_HS_XLD_IMAGE} ${UBOOT_HS_XLD_BINARY}
fi
-   if [ -f ${S}/${UBOOT_HS_MLO_BINARY} ]; then
-   install ${S}/${UBOOT_HS_MLO_BINARY} 
${DEPLOYDIR}/${UBOOT_HS_MLO_IMAGE}
+   if [ -f ${B}/${UBOOT_HS_MLO_BINARY} ]; then
+   install ${B}/${UBOOT_HS_MLO_BINARY} 
${DEPLOYDIR}/${UBOOT_HS_MLO_IMAGE}
rm -f ${UBOOT_HS_MLO_BINARY} ${UBOOT_HS_MLO_SYMLINK}
ln -sf ${UBOOT_HS_MLO_IMAGE} ${UBOOT_HS_MLO_SYMLINK}
ln -sf ${UBOOT_HS_MLO_IMAGE} ${UBOOT_HS_MLO_BINARY}
@@ -85,28 +85,28 @@ do_deploy_append () {
 }
 
 do_install_append_keystone () {
-   install ${S}/spl/${UBOOT_SPI_SPL_BINARY} 
${D}/boot/${UBOOT_SPI_SPL_IMAGE}
+   install ${B}/spl/${UBOOT_SPI_SPL_BINARY} 
${D}/boot/${UBOOT_SPI_SPL_IMAGE}
ln -sf ${UBOOT_SPI_SPL_IMAGE} ${D}/boot/${UBOOT_SPI_SPL_BINARY}
 
-   install ${S}/${UBOOT_SPI_BINARY} ${D}/boot/${UBOOT_SPI_IMAGE}
+   install ${B}/${UBOOT_SPI_BINARY} ${D}/boot/${UBOOT_SPI_IMAGE}
ln -sf ${UBOOT_SPI_IMAGE} ${D}/boot/${UBOOT_SPI_BINARY}
 
-   install ${S}/${UBOOT_SPI_GPH_BINARY} ${D}/boot/${UBOOT_SPI_GPH_IMAGE}
+   install ${B}/${UBOOT_SPI_GPH_BINARY} ${D}/boot/${UBOOT_SPI_GPH_IMAGE}
ln -sf ${UBOOT_SPI_GPH_IMAGE} ${D}/boot/${UBOOT_SPI_GPH_BINARY}
 }
 
 do_deploy_append_keystone () {
-   install ${S}/spl/${UBOOT_SPI_SPL_BINARY} 
${DEPLOYDIR}/${UBOOT_SPI_SPL_IMAGE}
+   install ${B}/spl/${UBOOT_SPI_SPL_BINARY} 
${DEPLOYDIR}/${UBOOT_SPI_SPL_IMAGE}
rm -f ${UBOOT_SPI_SPL_BINARY} ${UBOOT_SPI_SPL_SYMLINK}
ln -sf ${UBOOT_SPI_SPL_IMAGE} ${UBOOT_SPI_SPL_SYMLINK}
ln -sf ${UBOOT_SPI_SPL_IMAGE} ${UBOOT_SPI_SPL_BINARY}
 
-   install ${S}/${UBOOT_SPI_BINARY} ${DEPLOYDIR}/${UBOOT_SPI_IMAGE}
+   install ${B}/${UBOOT_SPI_BINARY} ${DEPLOYDIR}/${UBOOT_SPI_IMAGE}
rm -f ${UBOOT_SPI_BINARY} ${UBOOT_SPI_SYMLINK}
ln -sf ${UBOOT_SPI_IMAGE} ${UBOOT_SPI_SYMLINK}
ln -sf ${UBOOT_SPI_IMAGE} ${UBOOT_SPI_BINARY}
 
-   install ${S}/${UBOOT_SPI_GPH_BINARY} ${DEPLOYDIR}/${UBOOT_SPI_GPH_IMAGE}
+   install ${B}/${UBOOT_SPI_GPH_BINARY} ${DEPLOYDIR}/${UBOOT_SPI_GPH_IMAGE}
rm -f ${UBOOT_SPI_GPH_BINARY} ${UBOOT_SPI_GPH_SYMLINK}
ln -sf ${UBOOT_SPI_GPH_IMAGE} ${UBOOT_SPI_GPH_SYMLINK}
ln -sf ${UBOOT_SPI_GPH_IMAGE} ${UBOOT_SPI_GPH_BINARY}
diff --git a/recipes-bsp/u-boot/u-boot-ti.inc b/recipes-bsp/u-boot/u-boot-ti.inc
index b0054c9..661f931 100644
--- a/recipes-bsp/u-boot/u-boot-ti.inc
+++ b/recipes-bsp/u-boot