[yocto] [yocto-autobuilder][PATCH 2/2] CreateBBLayersConf.py: do not include meta-qt3 when oe-core version is >= 9

Bill Randle william.c.randle at intel.com
Tue Aug 2 13:53:32 PDT 2016


Oe-core version 9 upgraded LSB to version 5, so the LSB builds no longer
require qt3.

[YOCTO #10020]

Signed-off-by: Bill Randle <william.c.randle at intel.com>
---
 .../site-packages/autobuilder/buildsteps/CreateBBLayersConf.py       | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/python2.7/site-packages/autobuilder/buildsteps/CreateBBLayersConf.py b/lib/python2.7/site-packages/autobuilder/buildsteps/CreateBBLayersConf.py
index a00c991..da53efe 100644
--- a/lib/python2.7/site-packages/autobuilder/buildsteps/CreateBBLayersConf.py
+++ b/lib/python2.7/site-packages/autobuilder/buildsteps/CreateBBLayersConf.py
@@ -89,9 +89,8 @@ class CreateBBLayersConf(ShellCommand):
                     if (layer[layer.iterkeys().next()].has_key('checkout') and layer[layer.iterkeys().next()]['checkout'] is not False) \
                         or layer[layer.iterkeys().next()].has_key('checkout') is False:
                         if layer.iterkeys().next()=="meta-qt3":
-                            # For now, we want meta-qt3 in, no matter the layerversion
-                            #if layerversioncore is not None and int(layerversioncore) < 7:
-                            fout = fout + workdir + '/build/' + layer.iterkeys().next() + ' \ \n'
+                            if layerversioncore is not None and int(layerversioncore) < 9:
+                                fout = fout + workdir + '/build/' + layer.iterkeys().next() + ' \ \n'
                         elif layer.iterkeys().next()=="meta-qt4":
                             if layerversioncore is not None and int(layerversioncore) > 6:
                                 fout = fout + workdir + '/build/' + layer.iterkeys().next() + ' \ \n'
-- 
2.5.5




More information about the yocto mailing list