[yocto-autobuilder][PATCH 0/1] Add support for creating lib64 multilib configs

[yocto-autobuilder][PATCH 0/1] Add support for creating lib64 multilib configs

[Stefan Stanacar]

The following changes since commit 2c1a41e7fd054dc0443b4740c9f5e14d0bf25ce4:

  CreateAutoConf.py: Remove unneeded try/excepts (2013-04-02 11:59:45 -0700)

are available in the git repository at:

  git://git.yoctoproject.org/poky-contrib stefans/yab2
  http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=stefans/yab2

Stefan Stanacar (1):
  CreateAutoConf.py: add support for lib64 multilib

 .../site-packages/autobuilder/buildsteps/CreateAutoConf.py     | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

-- 
1.8.1.4

[yocto-autobuilder][PATCH 1/1] CreateAutoConf.py: add support for lib64 multilib

[Stefan Stanacar]

Add a check for 'multilib' : 'lib64' and keep the default as lib32,
so if a buildset has 'multilib': True (or 'multilib' : 'lib32') nothing changes.

Signed-off-by: Stefan Stanacar <stefanx.stanacar@intel.com>
---
 .../site-packages/autobuilder/buildsteps/CreateAutoConf.py     | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/lib/python2.7/site-packages/autobuilder/buildsteps/CreateAutoConf.py b/lib/python2.7/site-packages/autobuilder/buildsteps/CreateAutoConf.py
index ac90fd0..dbf7d14 100644
--- a/lib/python2.7/site-packages/autobuilder/buildsteps/CreateAutoConf.py
+++ b/lib/python2.7/site-packages/autobuilder/buildsteps/CreateAutoConf.py
@@ -81,10 +81,14 @@ class CreateAutoConf(ShellCommand):
             if self.pvr == "True":
                 fout = fout + 'LICENSE_FLAGS_WHITELIST += "license_cdv-pvr-driver" \n'
                 fout = fout + 'PVR_LICENSE = "yes" \n'
-            if self.multilib == "True":
+            if self.multilib:
                 fout = fout + 'require conf/multilib.conf \n'
-                fout = fout + 'MULTILIBS = "multilib:lib32" \n'
-                fout = fout + 'DEFAULTTUNE_virtclass-multilib-lib32 = "x86" \n'
+                if self.multilib == "True" or self.multilib == "lib32":
+                    fout = fout + 'MULTILIBS = "multilib:lib32" \n'
+                    fout = fout + 'DEFAULTTUNE_virtclass-multilib-lib32 = "x86" \n'
+                elif self.multilib == "lib64":
+                    fout = fout + 'MULTILIBS = "multilib:lib64" \n'
+                    fout = fout + 'DEFAULTTUNE_virtclass-multilib-lib64 = "x86-64" \n'
                 fout = fout + 'SSTATE_DIR ?= "' + os.environ.get("SSTATE_PUBLISH_DIR") + '/multilib" \n'
             else:
                 fout = fout + 'SSTATE_DIR ?= "' + os.environ.get("SSTATE_PUBLISH_DIR") + '/" \n'
-- 
1.8.1.4

Re: [yocto-autobuilder][PATCH 0/1] Add support for creating lib64 multilib configs

[Flanagan, Elizabeth]

[-- Attachment #1: Type: text/plain, Size: 1018 bytes --]

Pulled (along with the nightly-multilib.conf patch) into
eflanagan/yocto-autobuilder-refactor. Thanks!

-b


On Tue, Apr 2, 2013 at 12:54 PM, Stefan Stanacar <stefanx.stanacar@intel.com
> wrote:

> The following changes since commit
> 2c1a41e7fd054dc0443b4740c9f5e14d0bf25ce4:
>
>   CreateAutoConf.py: Remove unneeded try/excepts (2013-04-02 11:59:45
> -0700)
>
> are available in the git repository at:
>
>   git://git.yoctoproject.org/poky-contrib stefans/yab2
>   http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=stefans/yab2
>
> Stefan Stanacar (1):
>   CreateAutoConf.py: add support for lib64 multilib
>
>  .../site-packages/autobuilder/buildsteps/CreateAutoConf.py     | 10
> +++++++---
>  1 file changed, 7 insertions(+), 3 deletions(-)
>
> --
> 1.8.1.4
>
> _______________________________________________
> yocto mailing list
> yocto@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/yocto
>



-- 
Elizabeth Flanagan
Yocto Project
Build and Release

[-- Attachment #2: Type: text/html, Size: 1742 bytes --]