Skip to contentSkip to conversation

update meta-intel ab

PATCH New Stephano Cetola 1 participant 5 messages Nov 6, 2017

lore
Share & tools
lore
#0 lore raw

cover update meta-intel ab

There were a few changes that were not committed on the meta-intel autobuilder, specifically in the buildset configs. These patches get us back up to date with those changes.

There is also an update to meta-tlk which should not effect the yocto autobuilder. Since we now have meta-tlk as a separate layer from meta-intel, we need to add that layer's location based on meta-intel's layer version.

Stephano Cetola (4):
buildset-config.meta-intel: add oe-selftest buildsets intel-quark.conf: change the defaults for srcrev_meta and
srcrev_machine
buildset-config.meta-intel/nightly-meta-intel.conf: add rocko buildset-config.meta-intel: add meta-tlk

 .../intel-core2-32-lsb-rt.conf                     |  5 +++-
 buildset-config.meta-intel/intel-core2-32-lsb.conf |  4 +++
 buildset-config.meta-intel/intel-core2-32-rt.conf  |  5 +++-
 buildset-config.meta-intel/intel-core2-32.conf     |  4 +++
 .../intel-corei7-64-lsb-rt.conf                    |  4 +++
 .../intel-corei7-64-lsb.conf                       |  6 ++++-
 buildset-config.meta-intel/intel-corei7-64-rt.conf |  4 +++
 buildset-config.meta-intel/intel-corei7-64.conf    |  6 ++++-
 buildset-config.meta-intel/intel-quark.conf        | 12 ++++++---
 .../nightly-meta-intel-world.conf                  |  4 +++
 buildset-config.meta-intel/nightly-meta-intel.conf | 17 +++++++-----
 .../nightly-musl-core2-32.conf                     |  4 +++
 buildset-config.meta-intel/nightly-musl.conf       |  4 +++
 .../nightly-oe-selftest-core2-32.conf              | 31 ++++++++++++++++++++++
 .../nightly-oe-selftest-corei7.conf                | 31 ++++++++++++++++++++++
 .../nightly-oe-selftest-x86-64.conf                | 31 ++++++++++++++++++++++
 .../nightly-oe-selftest-x86.conf                   | 31 ++++++++++++++++++++++
 .../nightly-oe-selftest.conf                       | 30 +++++++++++++++++++++
 buildset-config.meta-intel/nightly-x32.conf        |  4 +++
 buildset-config.meta-intel/yoctoAB.conf            |  7 ++---
 .../autobuilder/buildsteps/CreateBBLayersConf.py   |  6 ++++-
 21 files changed, 231 insertions(+), 19 deletions(-)
 create mode 100644 buildset-config.meta-intel/nightly-oe-selftest-core2-32.conf
 create mode 100644 buildset-config.meta-intel/nightly-oe-selftest-corei7.conf
 create mode 100644 buildset-config.meta-intel/nightly-oe-selftest-x86-64.conf
 create mode 100644 buildset-config.meta-intel/nightly-oe-selftest-x86.conf
 create mode 100644 buildset-config.meta-intel/nightly-oe-selftest.conf
Signature · 1 line
2.14.2
#1 lore raw

PATCH 1/4 buildset-config.meta-intel: add oe-selftest buildsets

These buildset configs add RunOeSelftest steps for x86, x86-64, corei7 core2-32 and qemux86-64.

---
 .../nightly-oe-selftest-core2-32.conf              | 31 ++++++++++++++++++++++
 .../nightly-oe-selftest-corei7.conf                | 31 ++++++++++++++++++++++
 .../nightly-oe-selftest-x86-64.conf                | 31 ++++++++++++++++++++++
 .../nightly-oe-selftest-x86.conf                   | 31 ++++++++++++++++++++++
 .../nightly-oe-selftest.conf                       | 30 +++++++++++++++++++++
 5 files changed, 154 insertions(+)
 create mode 100644 buildset-config.meta-intel/nightly-oe-selftest-core2-32.conf
 create mode 100644 buildset-config.meta-intel/nightly-oe-selftest-corei7.conf
 create mode 100644 buildset-config.meta-intel/nightly-oe-selftest-x86-64.conf
 create mode 100644 buildset-config.meta-intel/nightly-oe-selftest-x86.conf
 create mode 100644 buildset-config.meta-intel/nightly-oe-selftest.conf
buildset-config.meta-intel/nightly-oe-selftest-core2-32.conf new file +31 -0
new file mode 100644
index 000000000..e174e82e8
@@ -0,0 +1,31 @@
+[nightly-oe-selftest-core2-32]
+builders: 'example-worker'
+repos: [{'poky':
+            {'repourl':'git://git.yoctoproject.org/poky',
+             'layerversion':{'core':'meta', 'yoctobsp':'meta-yocto-bsp', 'yocto':'meta-yocto', 'poky':'meta-poky'},
+             'branch':'master'}},
+        {'meta-tlk':
+            {'repourl':'git://git.yoctoproject.org/meta-tlk',
+             'autoinclude': False,
+             'branch':'master'}},
+        {'meta-intel':
+            {'repourl':'git://git.yoctoproject.org/meta-intel',
+             'layerversion':{'intel':'meta-intel'},
+             'branch':'master'}}]
+steps: [{'SetDest':{}},
+        {'CheckOutLayers': {}},
+        {'RunPreamble': {}},
+        {'GetDistroVersion' : {'distro': 'poky'}},
+        {'CreateAutoConf': {'machine': 'intel-core2-32', 'SDKMACHINE' : 'i686',
+                            'distro': 'poky', 'nosstate': True,
+                            'packages': 'rpm', 'buildhistory' : False,
+                            'prserv': False}},
+        {'CreateBBLayersConf': {'buildprovider' : 'yocto',
+                                'bsplayer': True, 'bspprovider': 'intel',
+                                'packages': 'rpm', 'buildhistory' : False,
+                                'prserv': False}},
+        {'BuildImages': {'images': 'core-image-minimal'}},
+        {'CreateBBLayersConf': {'buildprovider' : 'yocto', 'layerdirs': ['meta-selftest']}},
+        {'RunOeSelftest': {}},
+        {'DownloadErrorReports': {}},
+        {'SendErrorReport': {}}]
buildset-config.meta-intel/nightly-oe-selftest-corei7.conf new file +31 -0
new file mode 100644
index 000000000..e2e71272c
@@ -0,0 +1,31 @@
+[nightly-oe-selftest-corei7]
+builders: 'example-worker'
+repos: [{'poky':
+            {'repourl':'git://git.yoctoproject.org/poky',
+             'layerversion':{'core':'meta', 'yoctobsp':'meta-yocto-bsp', 'yocto':'meta-yocto', 'poky':'meta-poky'},
+             'branch':'master'}},
+        {'meta-tlk':
+            {'repourl':'git://git.yoctoproject.org/meta-tlk',
+             'autoinclude': False,
+             'branch':'master'}},
+        {'meta-intel':
+            {'repourl':'git://git.yoctoproject.org/meta-intel',
+             'layerversion':{'intel':'meta-intel'},
+             'branch':'master'}}]
+steps: [{'SetDest':{}},
+        {'CheckOutLayers': {}},
+        {'RunPreamble': {}},
+        {'GetDistroVersion' : {'distro': 'poky'}},
+        {'CreateAutoConf': {'machine': 'intel-corei7-64', 'SDKMACHINE' : 'i686',
+                            'distro': 'poky', 'nosstate': True,
+                            'packages': 'rpm', 'buildhistory' : False,
+                            'prserv': False}},
+        {'CreateBBLayersConf': {'buildprovider' : 'yocto',
+                                'bsplayer': True, 'bspprovider': 'intel',
+                                'packages': 'rpm', 'buildhistory' : False,
+                                'prserv': False}},
+        {'BuildImages': {'images': 'core-image-minimal'}},
+        {'CreateBBLayersConf': {'buildprovider' : 'yocto', 'layerdirs': ['meta-selftest']}},
+        {'RunOeSelftest': {}},
+        {'DownloadErrorReports': {}},
+        {'SendErrorReport': {}}]
buildset-config.meta-intel/nightly-oe-selftest-x86-64.conf new file +31 -0
new file mode 100644
index 000000000..98c08e160
@@ -0,0 +1,31 @@
+[nightly-oe-selftest-x86-64]
+builders: 'example-worker'
+repos: [{'poky':
+            {'repourl':'git://git.yoctoproject.org/poky',
+             'layerversion':{'core':'meta', 'yoctobsp':'meta-yocto-bsp', 'yocto':'meta-yocto', 'poky':'meta-poky'},
+             'branch':'master'}},
+        {'meta-tlk':
+            {'repourl':'git://git.yoctoproject.org/meta-tlk',
+             'autoinclude': False,
+             'branch':'master'}},
+        {'meta-intel':
+            {'repourl':'git://git.yoctoproject.org/meta-intel',
+             'layerversion':{'intel':'meta-intel'},
+             'branch':'master'}}]
+steps: [{'SetDest':{}},
+        {'CheckOutLayers': {}},
+        {'RunPreamble': {}},
+        {'GetDistroVersion' : {'distro': 'poky'}},
+        {'CreateBBLayersConf': {'buildprovider' : 'yocto',
+                                'bsplayer': True, 'bspprovider': 'intel',
+                                'layerdirs': ['meta-intel', 'meta-intel/meta-tlk']}},
+        {'CreateAutoConf': {'machine': 'genericx86-64', 'SDKMACHINE' : 'i686',
+                            'distro': 'poky', 'nosstate': True,
+                            'packages': 'rpm', 'buildhistory' : False,
+                            'prserv': False}},
+        {'CreateBBLayersConf': {'buildprovider' : 'yocto'}},
+        {'BuildImages': {'images': 'core-image-minimal'}},
+        {'CreateBBLayersConf': {'buildprovider' : 'yocto', 'layerdirs': ['meta-selftest']}},
+        {'RunOeSelftest': {}},
+        {'DownloadErrorReports': {}},
+        {'SendErrorReport': {}}]
buildset-config.meta-intel/nightly-oe-selftest-x86.conf new file +31 -0
new file mode 100644
index 000000000..2c2b794fc
@@ -0,0 +1,31 @@
+[nightly-oe-selftest-x86]
+builders: 'example-worker'
+repos: [{'poky':
+            {'repourl':'git://git.yoctoproject.org/poky',
+             'layerversion':{'core':'meta', 'yoctobsp':'meta-yocto-bsp', 'yocto':'meta-yocto', 'poky':'meta-poky'},
+             'branch':'master'}},
+        {'meta-tlk':
+            {'repourl':'git://git.yoctoproject.org/meta-tlk',
+             'autoinclude': False,
+             'branch':'master'}},
+        {'meta-intel':
+            {'repourl':'git://git.yoctoproject.org/meta-intel',
+             'layerversion':{'intel':'meta-intel'},
+             'branch':'master'}}]
+steps: [{'SetDest':{}},
+        {'CheckOutLayers': {}},
+        {'RunPreamble': {}},
+        {'GetDistroVersion' : {'distro': 'poky'}},
+        {'CreateBBLayersConf': {'buildprovider' : 'yocto',
+                                'bsplayer': True, 'bspprovider': 'intel',
+                                'layerdirs': ['meta-intel', 'meta-intel/meta-tlk']}},
+        {'CreateAutoConf': {'machine': 'genericx86', 'SDKMACHINE' : 'i686',
+                            'distro': 'poky', 'nosstate': True,
+                            'packages': 'rpm', 'buildhistory' : False,
+                            'prserv': False}},
+        {'CreateBBLayersConf': {'buildprovider' : 'yocto'}},
+        {'BuildImages': {'images': 'core-image-minimal'}},
+        {'CreateBBLayersConf': {'buildprovider' : 'yocto', 'layerdirs': ['meta-selftest']}},
+        {'RunOeSelftest': {}},
+        {'DownloadErrorReports': {}},
+        {'SendErrorReport': {}}]
buildset-config.meta-intel/nightly-oe-selftest.conf new file +30 -0
new file mode 100644
index 000000000..02586eeb6
@@ -0,0 +1,30 @@
+[nightly-oe-selftest]
+builders: 'example-worker'
+repos: [{'poky':
+            {'repourl':'git://git.yoctoproject.org/poky',
+             'layerversion':{'core':'meta', 'yoctobsp':'meta-yocto-bsp', 'yocto':'meta-yocto', 'poky':'meta-poky'},
+             'branch':'master'}},
+        {'meta-tlk':
+            {'repourl':'git://git.yoctoproject.org/meta-tlk',
+             'autoinclude': False,
+             'branch':'master'}},
+        {'meta-intel':
+            {'repourl':'git://git.yoctoproject.org/meta-intel',
+             'layerversion':{'intel':'meta-intel'},
+             'branch':'master'}}]
+steps: [{'SetDest':{}},
+        {'CheckOutLayers': {}},
+        {'RunPreamble': {}},
+        {'GetDistroVersion' : {'distro': 'poky'}},
+        {'CreateBBLayersConf': {'buildprovider' : 'yocto',
+                                'bsplayer': True, 'bspprovider': 'intel',
+                                'layerdirs': ['meta-intel', 'meta-intel/meta-tlk']}},
+        {'CreateAutoConf': {'machine': 'qemux86-64', 'SDKMACHINE' : 'x86_64',
+                            'distro': 'poky', 'packages': 'rpm',
+                            'buildhistory' : False, 'prserv': False}},
+        {'CreateBBLayersConf': {'buildprovider' : 'yocto'}},
+        {'BuildImages': {'images': 'core-image-minimal'}},
+        {'CreateBBLayersConf': {'buildprovider' : 'yocto', 'layerdirs': ['meta-selftest']}},
+        {'RunOeSelftest': {}},
+        {'DownloadErrorReports': {}},
+        {'SendErrorReport': {}}]
Signature · 1 line
2.14.2
#2 lore raw

PATCH 2/4 intel-quark.conf: change the defaults for srcrev_meta and srcrev_machine

In reply to Stephano Cetola

The default values for srcrev_machine and srcrev_meta should be set to blank rather than AUTOREV. AUTOREV will force them to the tip of the current branch, which is no longer needed.

---
 buildset-config.meta-intel/intel-quark.conf | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
buildset-config.meta-intel/intel-quark.conf +4 -4
index 931ead0e2..136c2257d 100644
@@ -16,8 +16,8 @@ props: [{'kmeta':{'prop_type':'StringParameter',
         {'srcrev_meta':{'prop_type':'StringParameter',
                        'size': 15,
                        'name': 'srcrev_meta',
-                       'default': '${AUTOREV}',
-                       'label':'<hr><h3> SRCREV for KMETA_${MACHINE} (default is ${AUTOREV}):<br></h3>'}},
+                       'default': '',
+                       'label':'<hr><h3> SRCREV for KMETA_${MACHINE} (default is blank):<br></h3>'}},
         {'srcuri_meta':{'prop_type':'StringParameter',
                        'size': 50,
                        'name': 'srcuri_meta',
@@ -31,8 +31,8 @@ props: [{'kmeta':{'prop_type':'StringParameter',
         {'srcrev_machine':{'prop_type':'StringParameter',
                        'size': 15,
                        'name': 'srcrev_machine',
-                       'default': '${AUTOREV}',
-                       'label':'<hr><h3> SRCREV for KBRANCH. (default is ${AUTOREV}):<br></h3>'}},
+                       'default': '',
+                       'label':'<hr><h3> SRCREV for KBRANCH. (default is blank):<br></h3>'}},
         {'srcuri_machine':{'prop_type':'StringParameter',
                        'size': 50,
                        'name': 'srcuri_machine',
Signature · 1 line
2.14.2
#3 lore raw

PATCH 3/4 buildset-config.meta-intel/nightly-meta-intel.conf: add rocko

In reply to Stephano Cetola

Yocto v2.4 is live and the codename is rocko. This adds that name to the list of possible releases.

---
 buildset-config.meta-intel/nightly-meta-intel.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
buildset-config.meta-intel/nightly-meta-intel.conf +1 -1
index ae14c6966..791053fc6 100644
@@ -19,7 +19,7 @@ props: [{'release_me':{'prop_type':'ChoiceStringParameter',
                        'name': 'release_me',
                        'label':'<h3> Generate a release?:</h3>'}},
         {'poky_name':{'prop_type':'ChoiceStringParameter',
-                       'choices': ['', 'pyro', 'morty', 'krogoth', 'jethro', 'fido'],
+                       'choices': ['', 'rocko', 'pyro', 'morty', 'krogoth', 'jethro', 'fido'],
                        'name': 'poky_name',
                        'label':'<h3> Name of the poky release.<br>For further info on release names see <a href="https://wiki.yoctoproject.org/wiki/Releases"> Releases </a> </h3>'}},
         {'is_milestone':{'prop_type':'ChoiceStringParameter',
Signature · 1 line
2.14.2
#4 lore raw

PATCH 4/4 buildset-config.meta-intel: add meta-tlk

In reply to Stephano Cetola

Since layer version 5 of meta-intel, meta-tlk is now an external layer rather than a sub-layer of meta-intel. This requires that we add meta-tlk as a repo to all buildset-configs, and set the autoinclude flag to False. Then we must check the layerdirs variable to see if it contains meta-intel/meta-tlk, and add the appropriate folder to the bblayers.conf depending on which layer version of meta-intel we are building.

Also, some cleanup was done on the buildset configs to remove extra white spaces or cleanup the formatting.

---
 buildset-config.meta-intel/intel-core2-32-lsb-rt.conf     |  5 ++++-
 buildset-config.meta-intel/intel-core2-32-lsb.conf        |  4 ++++
 buildset-config.meta-intel/intel-core2-32-rt.conf         |  5 ++++-
 buildset-config.meta-intel/intel-core2-32.conf            |  4 ++++
 buildset-config.meta-intel/intel-corei7-64-lsb-rt.conf    |  4 ++++
 buildset-config.meta-intel/intel-corei7-64-lsb.conf       |  6 +++++-
 buildset-config.meta-intel/intel-corei7-64-rt.conf        |  4 ++++
 buildset-config.meta-intel/intel-corei7-64.conf           |  6 +++++-
 buildset-config.meta-intel/intel-quark.conf               |  4 ++++
 buildset-config.meta-intel/nightly-meta-intel-world.conf  |  4 ++++
 buildset-config.meta-intel/nightly-meta-intel.conf        | 15 +++++++++------
 buildset-config.meta-intel/nightly-musl-core2-32.conf     |  4 ++++
 buildset-config.meta-intel/nightly-musl.conf              |  4 ++++
 buildset-config.meta-intel/nightly-x32.conf               |  4 ++++
 buildset-config.meta-intel/yoctoAB.conf                   |  7 ++++---
 .../autobuilder/buildsteps/CreateBBLayersConf.py          |  6 +++++-
 16 files changed, 72 insertions(+), 14 deletions(-)
buildset-config.meta-intel/intel-core2-32-lsb-rt.conf +4 -1
index a31d624ec..cbcb99b4a 100644
@@ -10,6 +10,10 @@ repos: [{'poky':
         {'meta-qt4':
             {'repourl':'git://git.yoctoproject.org/meta-qt4',
              'branch':'master'}},
+        {'meta-tlk':
+            {'repourl':'git://git.yoctoproject.org/meta-tlk',
+             'autoinclude': False,
+             'branch':'master'}},
         {'meta-intel':
             {'repourl':'git://git.yoctoproject.org/meta-intel',
              'layerversion':{'intel':'meta-intel'},
@@ -61,4 +65,3 @@ steps: [{'SetDest':{}},
         {'BuildImages': {'images': 'core-image-rt'}},
         {'PublishLayerTarballs':{}},
         {'PublishArtifacts': {'artifacts': ['conf', 'intel-core2-32']}}]
-
buildset-config.meta-intel/intel-core2-32-lsb.conf +4 -0
index 1aba39718..ccf1e6b8d 100644
@@ -10,6 +10,10 @@ repos: [{'poky':
         {'meta-qt4':
             {'repourl':'git://git.yoctoproject.org/meta-qt4',
              'branch':'master'}},
+        {'meta-tlk':
+            {'repourl':'git://git.yoctoproject.org/meta-tlk',
+             'autoinclude': False,
+             'branch':'master'}},
         {'meta-intel':
             {'repourl':'git://git.yoctoproject.org/meta-intel',
              'layerversion':{'intel':'meta-intel'},
buildset-config.meta-intel/intel-core2-32-rt.conf +4 -1
index df04d980d..b591e754f 100644
@@ -4,6 +4,10 @@ repos: [{'poky':
             {'repourl':'git://git.yoctoproject.org/poky',
              'layerversion':{'core':'meta', 'yoctobsp':'meta-yocto-bsp', 'yocto':'meta-yocto', 'poky':'meta-poky'},
              'branch':'master'}},
+        {'meta-tlk':
+            {'repourl':'git://git.yoctoproject.org/meta-tlk',
+             'autoinclude': False,
+             'branch':'master'}},
         {'meta-intel':
             {'repourl':'git://git.yoctoproject.org/meta-intel',
              'layerversion':{'intel':'meta-intel'},
@@ -54,4 +58,3 @@ steps: [{'SetDest':{}},
         {'BuildImages': {'images': 'core-image-rt'}},
         {'PublishLayerTarballs':{}},
         {'PublishArtifacts': {'artifacts': ['conf', 'intel-core2-32']}}]
-
buildset-config.meta-intel/intel-core2-32.conf +4 -0
index a5849722e..688a67446 100644
@@ -4,6 +4,10 @@ repos: [{'poky':
             {'repourl':'git://git.yoctoproject.org/poky',
              'layerversion':{'core':'meta', 'yoctobsp':'meta-yocto-bsp', 'yocto':'meta-yocto', 'poky':'meta-poky'},
              'branch':'master'}},
+        {'meta-tlk':
+            {'repourl':'git://git.yoctoproject.org/meta-tlk',
+             'autoinclude': False,
+             'branch':'master'}},
         {'meta-intel':
             {'repourl':'git://git.yoctoproject.org/meta-intel',
              'layerversion':{'intel':'meta-intel'},
buildset-config.meta-intel/intel-corei7-64-lsb-rt.conf +4 -0
index 76e0f9f11..53ed45940 100644
@@ -10,6 +10,10 @@ repos: [{'poky':
         {'meta-qt4':
             {'repourl':'git://git.yoctoproject.org/meta-qt4',
              'branch':'master'}},
+        {'meta-tlk':
+            {'repourl':'git://git.yoctoproject.org/meta-tlk',
+             'autoinclude': False,
+             'branch':'master'}},
         {'meta-intel':
             {'repourl':'git://git.yoctoproject.org/meta-intel',
              'layerversion':{'intel':'meta-intel'},
buildset-config.meta-intel/intel-corei7-64-lsb.conf +5 -1
index 60dda30ac..5ae2cf7fe 100644
@@ -10,6 +10,10 @@ repos: [{'poky':
         {'meta-qt4':
             {'repourl':'git://git.yoctoproject.org/meta-qt4',
              'branch':'master'}},
+        {'meta-tlk':
+            {'repourl':'git://git.yoctoproject.org/meta-tlk',
+             'autoinclude': False,
+             'branch':'master'}},
         {'meta-intel':
             {'repourl':'git://git.yoctoproject.org/meta-intel',
              'layerversion':{'intel':'meta-intel'},
@@ -49,7 +53,7 @@ steps: [{'SetDest':{}},
         {'RunPreamble': {}},
         {'CheckBSPExists': {}},
         {'GetDistroVersion' : {'distro': 'poky'}},
-        {'CreateAutoConf': {'machine': 'intel-corei7-64', 'SDKMACHINE' : 'x86_64', 
+        {'CreateAutoConf': {'machine': 'intel-corei7-64', 'SDKMACHINE' : 'x86_64',
                             'distro': 'poky-lsb'}},
         {'CreateBBLayersConf': {'buildprovider' : 'yocto',
                                 'bsplayer': True, 'bspprovider': 'intel',
buildset-config.meta-intel/intel-corei7-64-rt.conf +4 -0
index f80666c8a..ab84ebd34 100644
@@ -4,6 +4,10 @@ repos: [{'poky':
             {'repourl':'git://git.yoctoproject.org/poky',
              'layerversion':{'core':'meta', 'yoctobsp':'meta-yocto-bsp', 'yocto':'meta-yocto', 'poky':'meta-poky'},
              'branch':'master'}},
+        {'meta-tlk':
+            {'repourl':'git://git.yoctoproject.org/meta-tlk',
+             'autoinclude': False,
+             'branch':'master'}},
         {'meta-intel':
             {'repourl':'git://git.yoctoproject.org/meta-intel',
              'layerversion':{'intel':'meta-intel'},
buildset-config.meta-intel/intel-corei7-64.conf +5 -1
index 6337cefa9..a0bc1218f 100644
@@ -4,6 +4,10 @@ repos: [{'poky':
             {'repourl':'git://git.yoctoproject.org/poky',
              'layerversion':{'core':'meta', 'yoctobsp':'meta-yocto-bsp', 'yocto':'meta-yocto', 'poky':'meta-poky'},
              'branch':'master'}},
+        {'meta-tlk':
+            {'repourl':'git://git.yoctoproject.org/meta-tlk',
+             'autoinclude': False,
+             'branch':'master'}},
         {'meta-intel':
             {'repourl':'git://git.yoctoproject.org/meta-intel',
              'layerversion':{'intel':'meta-intel'},
@@ -43,7 +47,7 @@ steps: [{'SetDest':{}},
         {'RunPreamble': {}},
         {'CheckBSPExists': {}},
         {'GetDistroVersion' : {'distro': 'poky'}},
-        {'CreateAutoConf': {'machine': 'intel-corei7-64', 'SDKMACHINE' : 'x86_64', 
+        {'CreateAutoConf': {'machine': 'intel-corei7-64', 'SDKMACHINE' : 'x86_64',
                             'distro': 'poky'}},
         {'CreateBBLayersConf': {'buildprovider' : 'yocto',
                                 'bsplayer': True, 'bspprovider': 'intel',
buildset-config.meta-intel/intel-quark.conf +4 -0
index 136c2257d..8f0d5f27d 100644
@@ -4,6 +4,10 @@ repos: [{'poky':
             {'repourl':'git://git.yoctoproject.org/poky',
              'layerversion':{'core':'meta', 'yoctobsp':'meta-yocto-bsp', 'yocto':'meta-yocto', 'poky':'meta-poky'},
              'branch':'master'}},
+        {'meta-tlk':
+            {'repourl':'git://git.yoctoproject.org/meta-tlk',
+             'autoinclude': False,
+             'branch':'master'}},
         {'meta-intel':
             {'repourl':'git://git.yoctoproject.org/meta-intel',
              'layerversion':{'intel':'meta-intel'},
buildset-config.meta-intel/nightly-meta-intel-world.conf +4 -0
index 654c4f983..32c23e202 100644
@@ -4,6 +4,10 @@ repos: [{'poky':
             {'repourl':'git://git.yoctoproject.org/poky',
              'layerversion':{'core':'meta', 'yoctobsp':'meta-yocto-bsp', 'yocto':'meta-yocto', 'poky':'meta-poky'},
              'branch':'master'}},
+        {'meta-tlk':
+            {'repourl':'git://git.yoctoproject.org/meta-tlk',
+             'autoinclude': False,
+             'branch':'master'}},
         {'meta-intel':
             {'repourl':'git://git.yoctoproject.org/meta-intel',
              'layerversion':{'intel':'meta-intel'},
buildset-config.meta-intel/nightly-meta-intel.conf +9 -6
index 791053fc6..33446f757 100644
@@ -10,6 +10,10 @@ repos: [{'poky':
         {'meta-qt4':
             {'repourl':'git://git.yoctoproject.org/meta-qt4',
              'branch':'master'}},
+        {'meta-tlk':
+            {'repourl':'git://git.yoctoproject.org/meta-tlk',
+             'autoinclude': False,
+             'branch':'master'}},
         {'meta-intel':
             {'repourl':'git://git.yoctoproject.org/meta-intel',
              'layerversion':{'intel':'meta-intel'},
@@ -90,16 +94,15 @@ steps: [{'SetDest':{}},
         {'CheckOutLayers': {}},
         {'RunPreamble': {}},
         {'TriggerBuilds': {'copy_properties': ['custom_deploy_artifacts', 'custom_prefered_kernel', 'custom_kmeta', 'custom_kbranch', 'custom_srcrev_meta', 'custom_srcrev_machine', 'custom_srcuri_meta', 'custom_srcuri_machine'],
-                           'schedulerName': 'main-build', 'waitForFinish': 'True', 
-                           'schedulerNames': {'intel-core2-32':{}, 'intel-core2-32-lsb':{}, 
+                           'schedulerName': 'main-build', 'waitForFinish': 'True',
+                           'schedulerNames': {'intel-core2-32':{}, 'intel-core2-32-lsb':{},
                              'intel-core2-32-lsb-rt':{}, 'intel-core2-32-rt':{},
                              'intel-corei7-64':{}, 'intel-corei7-64-lsb':{},
-                             'intel-corei7-64-lsb-rt':{}, 'intel-corei7-64-rt':{}, 
-                             'intel-quark':{}, 'nightly-musl':{},
-                             'nightly-musl-core2-32':{}, 'nightly-x32':{}},
+                             'intel-corei7-64-lsb-rt':{}, 'intel-corei7-64-rt':{},
+                             'intel-quark':{}, 'nightly-musl':{}, 'nightly-musl-core2-32':{}, 'nightly-x32':{}},
                              'schedulerNames_nowait' : {'nightly-meta-intel-world':{}}}},
         {'CreateIntelBSPPackage': {'machine': 'intel-core2-32'}},
         {'CreateIntelBSPPackage': {'machine': 'intel-corei7-64'}},
-        {'CreateIntelBSPPackage': {'machine': 'intel-quark'}}, 
+        {'CreateIntelBSPPackage': {'machine': 'intel-quark'}},
         {'SendQAEmail': {}},
         {'CreateCurrentLink' : {}}]
buildset-config.meta-intel/nightly-musl-core2-32.conf +4 -0
index e83d03c40..30eb436f3 100644
@@ -4,6 +4,10 @@ repos: [{'poky':
             {'repourl':'git://git.yoctoproject.org/poky',
              'layerversion':{'core':'meta', 'yoctobsp':'meta-yocto-bsp', 'yocto':'meta-yocto', 'poky':'meta-poky'},
              'branch':'master'}},
+        {'meta-tlk':
+            {'repourl':'git://git.yoctoproject.org/meta-tlk',
+             'autoinclude': False,
+             'branch':'master'}},
         {'meta-intel':
             {'repourl':'git://git.yoctoproject.org/meta-intel',
              'layerversion':{'intel':'meta-intel'},
buildset-config.meta-intel/nightly-musl.conf +4 -0
index 7687825dc..e125e2a94 100644
@@ -4,6 +4,10 @@ repos: [{'poky':
             {'repourl':'git://git.yoctoproject.org/poky',
              'layerversion':{'core':'meta', 'yoctobsp':'meta-yocto-bsp', 'yocto':'meta-yocto', 'poky':'meta-poky'},
              'branch':'master'}},
+        {'meta-tlk':
+            {'repourl':'git://git.yoctoproject.org/meta-tlk',
+             'autoinclude': False,
+             'branch':'master'}},
         {'meta-intel':
             {'repourl':'git://git.yoctoproject.org/meta-intel',
              'layerversion':{'intel':'meta-intel'},
buildset-config.meta-intel/nightly-x32.conf +4 -0
index 47e659765..8b50a8c23 100644
@@ -4,6 +4,10 @@ repos: [{'poky':
             {'repourl':'git://git.yoctoproject.org/poky',
              'layerversion':{'core':'meta', 'yoctobsp':'meta-yocto-bsp', 'yocto':'meta-yocto', 'poky':'meta-poky'},
              'branch':'master'}},
+        {'meta-tlk':
+            {'repourl':'git://git.yoctoproject.org/meta-tlk',
+             'autoinclude': False,
+             'branch':'master'}},
         {'meta-intel':
             {'repourl':'git://git.yoctoproject.org/meta-intel',
              'layerversion':{'intel':'meta-intel'},
buildset-config.meta-intel/yoctoAB.conf +4 -3
index 646fd90f9..437d233a9 100644
@@ -1,5 +1,6 @@
 [BuildSets]
 order: ['nightly-meta-intel', 'nightly-meta-intel-world', 'nightly-musl',
-        'nightly-musl-core2-32', 'nightly-x32', 'intel-corei7-64',
-        'intel-corei7-64-lsb', 'intel-corei7-64-rt', 'intel-corei7-64-lsb-rt',
-        'intel-core2-32', 'intel-core2-32-rt', 'intel-core2-32-lsb-rt', 'intel-quark']
+        'nightly-x32', 'intel-corei7-64', 'intel-corei7-64-lsb', 
+        'intel-corei7-64-rt', 'intel-corei7-64-lsb-rt', 'intel-core2-32', 
+        'intel-core2-32-lsb', 'intel-core2-32-rt', 'intel-core2-32-lsb-rt', 
+        'intel-quark'] 
lib/python2.7/site-packages/autobuilder/buildsteps/CreateBBLayersConf.py +5 -1
index 593b9ee37..c40b899ec 100644
@@ -41,6 +41,7 @@ class CreateBBLayersConf(ShellCommand):
         workdir=self.getProperty("workdir")
         layerversioncore = int(self.getProperty("layerversion_core", "0"))
         layerversionyocto = int(self.getProperty("layerversion_yocto", "0"))
+        layerversionintel = int(self.getProperty("layerversion_intel", "0"))
         if self.bbtextprepend != "":
             fout = fout +"\n"+self.bbtextprepend
         if self.bbtext:
@@ -106,7 +107,10 @@ class CreateBBLayersConf(ShellCommand):
             if list(self.layerdirs):
                 for layer in self.layerdirs:
                     if layer not in ldirs:
-                        fout = fout + workdir + '/build/' + layer + ' \ \n'
+                        if layer == "meta-intel/meta-tlk" and layerversionintel > 4:
+                            fout = fout + workdir + '/build/meta-tlk \ \n'
+                        else:
+                            fout = fout + workdir + '/build/' + layer + ' \ \n'
                         ldirs.append(layer)
             fout = fout + '" \n'
             if self.bbtextappend != "":
Signature · 1 line
2.14.2