[yocto] [yocto-autobuilder][PATCH] CreateAutoConf: strict checking for multilib

Stefan Stanacar stefanx.stanacar at intel.com
Tue Apr 1 03:47:02 PDT 2014


So we don't create multilib configs unless True or lib32 or lib64,
and doesn't add the inherit multilib.conf for False.

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

diff --git a/lib/python2.7/site-packages/autobuilder/buildsteps/CreateAutoConf.py b/lib/python2.7/site-packages/autobuilder/buildsteps/CreateAutoConf.py
index ec69355..59a88c4 100644
--- a/lib/python2.7/site-packages/autobuilder/buildsteps/CreateAutoConf.py
+++ b/lib/python2.7/site-packages/autobuilder/buildsteps/CreateAutoConf.py
@@ -95,12 +95,13 @@ 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:
-                fout = fout + 'require conf/multilib.conf \n'
+            if self.multilib and self.multilib != "False":
                 if self.multilib == "True" or self.multilib == "lib32":
+                    fout = fout + 'require conf/multilib.conf \n'
                     fout = fout + 'MULTILIBS = "multilib:lib32" \n'
                     fout = fout + 'DEFAULTTUNE_virtclass-multilib-lib32 = "x86" \n'
                 elif self.multilib == "lib64":
+                    fout = fout + 'require conf/multilib.conf \n'
                     fout = fout + 'MULTILIBS = "multilib:lib64" \n'
                     fout = fout + 'DEFAULTTUNE_virtclass-multilib-lib64 = "x86-64" \n'
                 if not self.nosstate:
-- 
1.9.0




More information about the yocto mailing list