[meta-fsl-ppc] [PATCH] classes/u-boot: Update getVar syntax

[meta-fsl-ppc] [PATCH] classes/u-boot: Update getVar syntax

[Richard Purdie]

This runs:

sed -e 's:\(\.getVar([^,()]*\)):\1, False):g' -i `grep -ril getVar *`

on the layer to update the getVar usages without an expand parameter,
This ensures the layer continues to work with bitbake master.

There is no functionality change although some of these sites
may benefit from expand=True.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 classes/qoriq_build_64bit_kernel.bbclass   | 14 +++++++-------
 recipes-bsp/u-boot/u-boot-qoriq_2015.01.bb |  6 +++---
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/classes/qoriq_build_64bit_kernel.bbclass b/classes/qoriq_build_64bit_kernel.bbclass
index f145746..2209e33 100644
--- a/classes/qoriq_build_64bit_kernel.bbclass
+++ b/classes/qoriq_build_64bit_kernel.bbclass
@@ -2,15 +2,15 @@ inherit distro_features_check
 REQUIRED_DISTRO_FEATURES_e6500 += "multiarch"
 
 python () {
-    promote_kernel = d.getVar('BUILD_64BIT_KERNEL')
+    promote_kernel = d.getVar('BUILD_64BIT_KERNEL', False)
     if promote_kernel == "1":
-        sys_multilib = 'powerpc64' + d.getVar('TARGET_VENDOR') + 'mllib64-' + d.getVar('HOST_OS')
-        tc_options = d.getVar('TOOLCHAIN_OPTIONS') + '/../lib64-' + d.getVar("MACHINE")
+        sys_multilib = 'powerpc64' + d.getVar('TARGET_VENDOR', False) + 'mllib64-' + d.getVar('HOST_OS', False)
+        tc_options = d.getVar('TOOLCHAIN_OPTIONS', False) + '/../lib64-' + d.getVar("MACHINE", False)
         d.setVar('DEPENDS_append', ' lib64-gcc-cross-powerpc64 lib64-libgcc')
-        d.setVar('PATH_append', ':' + d.getVar('STAGING_BINDIR_NATIVE') + '/' + sys_multilib)
-        d.setVar('KERNEL_CC', d.getVar('CCACHE') + sys_multilib + '-' + 'gcc' + d.getVar('HOST_CC_KERNEL_ARCH') + tc_options)
-        d.setVar('KERNEL_LD', d.getVar('CCACHE') + sys_multilib + '-' + 'ld.bfd' + d.getVar('HOST_LD_KERNEL_ARCH') + tc_options)
-        d.setVar('KERNEL_AR', d.getVar('CCACHE') + sys_multilib + '-' + 'ar' + d.getVar('HOST_AR_KERNEL_ARCH'))
+        d.setVar('PATH_append', ':' + d.getVar('STAGING_BINDIR_NATIVE', False) + '/' + sys_multilib)
+        d.setVar('KERNEL_CC', d.getVar('CCACHE', False) + sys_multilib + '-' + 'gcc' + d.getVar('HOST_CC_KERNEL_ARCH', False) + tc_options)
+        d.setVar('KERNEL_LD', d.getVar('CCACHE', False) + sys_multilib + '-' + 'ld.bfd' + d.getVar('HOST_LD_KERNEL_ARCH', False) + tc_options)
+        d.setVar('KERNEL_AR', d.getVar('CCACHE', False) + sys_multilib + '-' + 'ar' + d.getVar('HOST_AR_KERNEL_ARCH', False))
 
     error_qa = d.getVar('ERROR_QA', True)
     if 'arch' in error_qa:
diff --git a/recipes-bsp/u-boot/u-boot-qoriq_2015.01.bb b/recipes-bsp/u-boot/u-boot-qoriq_2015.01.bb
index 7b942c7..172c757 100644
--- a/recipes-bsp/u-boot/u-boot-qoriq_2015.01.bb
+++ b/recipes-bsp/u-boot/u-boot-qoriq_2015.01.bb
@@ -37,10 +37,10 @@ python () {
     if "e5500-64b:" in arch or "e6500-64b:" in arch:
         if not "lib32" in ml:
             raise bb.parse.SkipPackage("Building the u-boot for this arch requires multilib to be enabled")
-        sys_multilib = 'powerpc' + d.getVar('TARGET_VENDOR') + 'mllib32-' + d.getVar('HOST_OS')
+        sys_multilib = 'powerpc' + d.getVar('TARGET_VENDOR', False) + 'mllib32-' + d.getVar('HOST_OS', False)
         d.setVar('DEPENDS_append', ' lib32-gcc-cross-powerpc lib32-libgcc')
-        d.setVar('PATH_append', ':' + d.getVar('STAGING_BINDIR_NATIVE') + '/' + sys_multilib)
-        d.setVar('TOOLCHAIN_OPTIONS_append', '/../lib32-' + d.getVar("MACHINE"))
+        d.setVar('PATH_append', ':' + d.getVar('STAGING_BINDIR_NATIVE', False) + '/' + sys_multilib)
+        d.setVar('TOOLCHAIN_OPTIONS_append', '/../lib32-' + d.getVar("MACHINE", False))
         d.setVar("WRAP_TARGET_PREFIX", sys_multilib + '-')
 }
 

Re: [meta-fsl-ppc] [PATCH] classes/u-boot: Update getVar syntax

[Richard Purdie]

On Sat, 2016-02-06 at 13:00 +0000, Richard Purdie wrote:
> This runs:
> 
> sed -e 's:\(\.getVar([^,()]*\)):\1, False):g' -i `grep -ril getVar *`
> 
> on the layer to update the getVar usages without an expand parameter,
> This ensures the layer continues to work with bitbake master.
> 
> There is no functionality change although some of these sites
> may benefit from expand=True.
> 
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> ---
>  classes/qoriq_build_64bit_kernel.bbclass   | 14 +++++++-------
>  recipes-bsp/u-boot/u-boot-qoriq_2015.01.bb |  6 +++---
>  2 files changed, 10 insertions(+), 10 deletions(-)

Could someone *please* merge this patch to meta-fsl-ppc. If this isn't
merged, we can't move forward with the variable transition since the
autobuilder includes this layer in its automated tests. I appreciate
there have been holidays but this does need to get dealt with.

I'd also note that openssl is failing to build in meta-fsl-ppc after
the no-static libs change to poky.

Cheers,

Richard

Re: [meta-fsl-ppc] [PATCH] classes/u-boot: Update getVar syntax

[Ting Liu]

Hello Richard,

> -----Original Message-----
> From: Richard Purdie [mailto:richard.purdie@linuxfoundation.org]
> Sent: Wednesday, February 17, 2016 4:32 PM
> To: meta-freescale <meta-freescale@yoctoproject.org>
> Cc: Ting Liu <ting.liu@nxp.com>
> Subject: Re: [meta-freescale] [meta-fsl-ppc] [PATCH] classes/u-boot: Update
> getVar syntax
> 
> On Sat, 2016-02-06 at 13:00 +0000, Richard Purdie wrote:
> > This runs:
> >
> > sed -e 's:\(\.getVar([^,()]*\)):\1, False):g' -i `grep -ril getVar *`
> >
> > on the layer to update the getVar usages without an expand parameter,
> > This ensures the layer continues to work with bitbake master.
> >
> > There is no functionality change although some of these sites may
> > benefit from expand=True.
> >
> > Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> > ---
> >  classes/qoriq_build_64bit_kernel.bbclass   | 14 +++++++-------
> >  recipes-bsp/u-boot/u-boot-qoriq_2015.01.bb |  6 +++---
> >  2 files changed, 10 insertions(+), 10 deletions(-)
> 
> Could someone *please* merge this patch to meta-fsl-ppc. If this isn't
> merged, we can't move forward with the variable transition since the
> autobuilder includes this layer in its automated tests. I appreciate there have
> been holidays but this does need to get dealt with.
[Liu Ting-B28495] I had asked Zhenhua to apply it ASAP.

> 
> I'd also note that openssl is failing to build in meta-fsl-ppc after the no-static
> libs change to poky.
[Liu Ting-B28495] I had sent patch to fix it.

> 
> Cheers,
> 
> Richard

Re: [meta-fsl-ppc] [PATCH] classes/u-boot: Update getVar syntax

[Richard Purdie]

On Thu, 2016-02-18 at 05:00 +0000, Ting Liu wrote:
> Hello Richard,
> 
> > -----Original Message-----
> > From: Richard Purdie [mailto:richard.purdie@linuxfoundation.org]
> > Sent: Wednesday, February 17, 2016 4:32 PM
> > To: meta-freescale <meta-freescale@yoctoproject.org>
> > Cc: Ting Liu <ting.liu@nxp.com>
> > Subject: Re: [meta-freescale] [meta-fsl-ppc] [PATCH] classes/u
> > -boot: Update
> > getVar syntax
> > 
> > On Sat, 2016-02-06 at 13:00 +0000, Richard Purdie wrote:
> > > This runs:
> > > 
> > > sed -e 's:\(\.getVar([^,()]*\)):\1, False):g' -i `grep -ril
> > > getVar *`
> > > 
> > > on the layer to update the getVar usages without an expand
> > > parameter,
> > > This ensures the layer continues to work with bitbake master.
> > > 
> > > There is no functionality change although some of these sites may
> > > benefit from expand=True.
> > > 
> > > Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org
> > > >
> > > ---
> > >  classes/qoriq_build_64bit_kernel.bbclass   | 14 +++++++-------
> > >  recipes-bsp/u-boot/u-boot-qoriq_2015.01.bb |  6 +++---
> > >  2 files changed, 10 insertions(+), 10 deletions(-)
> > 
> > Could someone *please* merge this patch to meta-fsl-ppc. If this
> > isn't
> > merged, we can't move forward with the variable transition since
> > the
> > autobuilder includes this layer in its automated tests. I
> > appreciate there have
> > been holidays but this does need to get dealt with.
> [Liu Ting-B28495] I had asked Zhenhua to apply it ASAP.
> 
> > 
> > I'd also note that openssl is failing to build in meta-fsl-ppc
> > after the no-static
> > libs change to poky.
> [Liu Ting-B28495] I had sent patch to fix it.

Thanks, its great to get these resolved!

Cheers,

Richard