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 <[email protected]> --- .../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 _______________________________________________ yocto mailing list [email protected] https://lists.yoctoproject.org/listinfo/yocto
