[yocto] [PATCH][yocto-autobuilder 2/2] buildset-config.controller: don't build Qt3 images
Ross Burton
ross.burton at intel.com
Thu Jul 23 14:31:53 PDT 2015
Qt3 is incredibly old and not required by LSB 5, so now is time to remove it
from the autobuilder.
Signed-off-by: Ross Burton <ross.burton at intel.com>
---
buildset-config.controller/minnow-lsb.conf | 5 +----
buildset-config.controller/nightly-arm-lsb.conf | 5 +----
buildset-config.controller/nightly-fsl-arm-lsb.conf | 9 +++------
buildset-config.controller/nightly-fsl-ppc-lsb.conf | 5 +----
buildset-config.controller/nightly-mips-lsb.conf | 5 +----
buildset-config.controller/nightly-ppc-lsb.conf | 5 +----
buildset-config.controller/nightly-x86-64-lsb.conf | 5 +----
buildset-config.controller/nightly-x86-lsb.conf | 5 +----
buildset-config.controller/nightly.conf | 5 +----
9 files changed, 11 insertions(+), 38 deletions(-)
diff --git a/buildset-config.controller/minnow-lsb.conf b/buildset-config.controller/minnow-lsb.conf
index ea65e84..c8ec405 100644
--- a/buildset-config.controller/minnow-lsb.conf
+++ b/buildset-config.controller/minnow-lsb.conf
@@ -4,9 +4,6 @@ repos: [{'poky':
{'repourl':'git://git.yoctoproject.org/poky',
'layerversion':{'core':'meta', 'yoctobsp':'meta-yocto-bsp'},
'branch':'master'}},
- {'meta-qt3':
- {'repourl':'git://git.yoctoproject.org/meta-qt3',
- 'branch':'master'}},
{'meta-intel':
{'repourl':'git://git.yoctoproject.org/meta-intel',
'branch':'master'}},
@@ -20,7 +17,7 @@ steps: [{'SetDest':{}},
{'CreateAutoConf': {'machine': 'minnow', 'SDKMACHINE' : 'x86_64', 'distro': 'poky-lsb', 'emgd': 'True', 'pvr': 'False', 'atextappend': '\nNOISO="1"\nCORE_IMAGE_EXTRA_INSTALL += "dmidecode pciutils ethtool alsa-utils"\n'}},
{'CreateBBLayersConf': {'buildprovider' : 'yocto', 'bsplayer': True, 'bspprovider': 'intel','layerdirs': ['meta-minnow', 'meta-intel', 'meta-intel/meta-tlk']}},
{'CheckForMinnow':{}},
- {'BuildImages': {'images': 'core-image-lsb core-image-lsb-dev core-image-lsb-sdk core-image-lsb-qt3'}},
+ {'BuildImages': {'images': 'core-image-lsb core-image-lsb-dev core-image-lsb-sdk'}},
{'PublishLayerTarballs':{}},
{'SendErrorReport': {}},
{'PublishArtifacts': {'artifacts': ['conf', 'minnow', 'md5sums']}}]
diff --git a/buildset-config.controller/nightly-arm-lsb.conf b/buildset-config.controller/nightly-arm-lsb.conf
index f950b6d..f7b98eb 100644
--- a/buildset-config.controller/nightly-arm-lsb.conf
+++ b/buildset-config.controller/nightly-arm-lsb.conf
@@ -3,9 +3,6 @@ builders: 'example-worker'
repos: [{'poky':
{'repourl':'git://git.yoctoproject.org/poky',
'layerversion':{'core':'meta', 'yoctobsp':'meta-yocto-bsp'},
- 'branch':'master'}},
- {'meta-qt3':
- {'repourl':'git://git.yoctoproject.org/meta-qt3',
'branch':'master'}}]
steps: [{'SetDest':{}},
{'CheckOutLayers': {}},
@@ -16,7 +13,7 @@ steps: [{'SetDest':{}},
{'CreateBBLayersConf': {'buildprovider' : 'yocto'}},
{'SyncPersistDB' : {'distro' : 'poky-lsb'}},
{'GetBitbakeVersion': {}},
- {'BuildImages': {'images': 'core-image-lsb core-image-lsb-dev core-image-lsb-sdk core-image-lsb-qt3'}},
+ {'BuildImages': {'images': 'core-image-lsb core-image-lsb-dev core-image-lsb-sdk'}},
{'CreateAutoConf': {'machine': 'beagleboard', 'SDKMACHINE' : 'i686', 'distro': 'poky-lsb'}},
{'BuildImages': {'images': 'core-image-lsb core-image-lsb-sdk'}},
{'SyncPersistDB' : {'commit' : True, 'distro':'poky-lsb'}},
diff --git a/buildset-config.controller/nightly-fsl-arm-lsb.conf b/buildset-config.controller/nightly-fsl-arm-lsb.conf
index 4599247..8380b84 100644
--- a/buildset-config.controller/nightly-fsl-arm-lsb.conf
+++ b/buildset-config.controller/nightly-fsl-arm-lsb.conf
@@ -6,9 +6,6 @@ repos: [{'poky':
'branch':'master'}},
{'meta-fsl-arm':
{'repourl':'git://git.yoctoproject.org/meta-fsl-arm',
- 'branch':'master'}},
- {'meta-qt3':
- {'repourl':'git://git.yoctoproject.org/meta-qt3',
'branch':'master'}}]
steps: [{'SetDest':{}},
{'CheckOutLayers': {}},
@@ -20,17 +17,17 @@ steps: [{'SetDest':{}},
'devkernel' : False}},
{'CreateBBLayersConf': {'buildprovider' : 'yocto', 'bsplayer' : True, 'bspprovider' : 'fsl-arm'}},
{'GetBitbakeVersion': {}},
- {'BuildImages': {'images': 'core-image-lsb core-image-lsb-dev core-image-lsb-sdk core-image-lsb-qt3'}},
+ {'BuildImages': {'images': 'core-image-lsb core-image-lsb-dev core-image-lsb-sdk'}},
{'CreateAutoConf': {'machine': 'imx6qsabresd', 'SDKMACHINE' : 'x86_64',
'distro': 'poky-lsb', 'buildhistory' : False,
'atextprepend': 'ACCEPT_FSL_EULA = "1"\n',
'devkernel' : False}},
- {'BuildImages': {'images': 'core-image-lsb core-image-lsb-dev core-image-lsb-sdk core-image-lsb-qt3'}},
+ {'BuildImages': {'images': 'core-image-lsb core-image-lsb-dev core-image-lsb-sdk'}},
{'CreateAutoConf': {'machine': 'imx28evk', 'SDKMACHINE' : 'x86_64',
'distro': 'poky-lsb', 'buildhistory' : False,
'atextprepend': 'ACCEPT_FSL_EULA = "1"\n',
'devkernel' : False}},
- {'BuildImages': {'images': 'core-image-lsb core-image-lsb-dev core-image-lsb-sdk core-image-lsb-qt3'}},
+ {'BuildImages': {'images': 'core-image-lsb core-image-lsb-dev core-image-lsb-sdk'}},
{'PublishLayerTarballs':{}},
{'SendErrorReport': {}},
{'UploadToasterEventlog': {}},
diff --git a/buildset-config.controller/nightly-fsl-ppc-lsb.conf b/buildset-config.controller/nightly-fsl-ppc-lsb.conf
index e9fccc1..a9db2ec 100644
--- a/buildset-config.controller/nightly-fsl-ppc-lsb.conf
+++ b/buildset-config.controller/nightly-fsl-ppc-lsb.conf
@@ -6,9 +6,6 @@ repos: [{'poky':
'branch':'master'}},
{'meta-fsl-ppc':
{'repourl':'git://git.yoctoproject.org/meta-fsl-ppc',
- 'branch':'master'}},
- {'meta-qt3':
- {'repourl':'git://git.yoctoproject.org/meta-qt3',
'branch':'master'}}]
steps: [{'SetDest':{}},
{'CheckOutLayers': {}},
@@ -20,7 +17,7 @@ steps: [{'SetDest':{}},
'devkernel' : False}},
{'CreateBBLayersConf': {'buildprovider' : 'yocto', 'bsplayer' : True, 'bspprovider' : 'fsl-ppc'}},
{'GetBitbakeVersion': {}},
- {'BuildImages': {'images': 'core-image-lsb core-image-lsb-dev core-image-lsb-sdk core-image-lsb-qt3'}},
+ {'BuildImages': {'images': 'core-image-lsb core-image-lsb-dev core-image-lsb-sdk'}},
{'PublishLayerTarballs':{}},
{'SendErrorReport': {}},
{'UploadToasterEventlog': {}},
diff --git a/buildset-config.controller/nightly-mips-lsb.conf b/buildset-config.controller/nightly-mips-lsb.conf
index 78c49dc..f5b90d6 100644
--- a/buildset-config.controller/nightly-mips-lsb.conf
+++ b/buildset-config.controller/nightly-mips-lsb.conf
@@ -3,9 +3,6 @@ builders: 'example-worker'
repos: [{'poky':
{'repourl':'git://git.yoctoproject.org/poky',
'layerversion':{'core':'meta', 'yoctobsp':'meta-yocto-bsp'},
- 'branch':'master'}},
- {'meta-qt3':
- {'repourl':'git://git.yoctoproject.org/meta-qt3',
'branch':'master'}}]
steps: [{'SetDest':{}},
{'CheckOutLayers': {}},
@@ -16,7 +13,7 @@ steps: [{'SetDest':{}},
{'CreateBBLayersConf': {'buildprovider' : 'yocto'}},
{'SyncPersistDB' : {'distro' : 'poky-lsb'}},
{'GetBitbakeVersion': {}},
- {'BuildImages': {'images': 'core-image-lsb core-image-lsb-dev core-image-lsb-sdk core-image-lsb-qt3'}},
+ {'BuildImages': {'images': 'core-image-lsb core-image-lsb-dev core-image-lsb-sdk'}},
{'CreateAutoConf': {'machine': 'routerstationpro',
'SDKMACHINE' : 'i686', 'distro': 'poky-lsb'}},
{'BuildImages': {'images': 'core-image-lsb core-image-lsb-sdk'}},
diff --git a/buildset-config.controller/nightly-ppc-lsb.conf b/buildset-config.controller/nightly-ppc-lsb.conf
index 179121d..a17a023 100644
--- a/buildset-config.controller/nightly-ppc-lsb.conf
+++ b/buildset-config.controller/nightly-ppc-lsb.conf
@@ -3,9 +3,6 @@ builders: 'example-worker'
repos: [{'poky':
{'repourl':'git://git.yoctoproject.org/poky',
'layerversion':{'core':'meta', 'yoctobsp':'meta-yocto-bsp'},
- 'branch':'master'}},
- {'meta-qt3':
- {'repourl':'git://git.yoctoproject.org/meta-qt3',
'branch':'master'}}]
steps: [{'SetDest':{}},
{'CheckOutLayers': {}},
@@ -16,7 +13,7 @@ steps: [{'SetDest':{}},
{'CreateBBLayersConf': {'buildprovider' : 'yocto'}},
{'SyncPersistDB' : {'distro' : 'poky-lsb'}},
{'GetBitbakeVersion': {}},
- {'BuildImages': {'images': 'core-image-lsb core-image-lsb-dev core-image-lsb-sdk core-image-lsb-qt3'}},
+ {'BuildImages': {'images': 'core-image-lsb core-image-lsb-dev core-image-lsb-sdk'}},
{'CreateAutoConf': {'machine': 'mpc8315e-rdb', 'SDKMACHINE' : 'i686',
'distro': 'poky-lsb', 'buildhistory' : False}},
{'BuildImages': {'images': 'core-image-lsb core-image-lsb-sdk'}},
diff --git a/buildset-config.controller/nightly-x86-64-lsb.conf b/buildset-config.controller/nightly-x86-64-lsb.conf
index 35319f2..a8a4453 100644
--- a/buildset-config.controller/nightly-x86-64-lsb.conf
+++ b/buildset-config.controller/nightly-x86-64-lsb.conf
@@ -3,9 +3,6 @@ builders: 'example-worker'
repos: [{'poky':
{'repourl':'git://git.yoctoproject.org/poky',
'layerversion':{'core':'meta', 'yoctobsp':'meta-yocto-bsp'},
- 'branch':'master'}},
- {'meta-qt3':
- {'repourl':'git://git.yoctoproject.org/meta-qt3',
'branch':'master'}}]
steps: [{'SetDest':{}},
{'CheckOutLayers': {}},
@@ -16,7 +13,7 @@ steps: [{'SetDest':{}},
{'CreateBBLayersConf': {'buildprovider' : 'yocto'}},
{'SyncPersistDB' : {'distro' : 'poky-lsb'}},
{'GetBitbakeVersion': {}},
- {'BuildImages': {'images': 'core-image-lsb core-image-lsb-dev core-image-lsb-sdk core-image-lsb-qt3'}},
+ {'BuildImages': {'images': 'core-image-lsb core-image-lsb-dev core-image-lsb-sdk'}},
{'CreateAutoConf': {'machine': 'genericx86-64', 'SDKMACHINE' : 'i686',
'distro': 'poky-lsb', 'buildhistory' : False}},
{'BuildImages': {'images': 'core-image-lsb core-image-lsb-sdk'}},
diff --git a/buildset-config.controller/nightly-x86-lsb.conf b/buildset-config.controller/nightly-x86-lsb.conf
index dc22f80..5151b01 100644
--- a/buildset-config.controller/nightly-x86-lsb.conf
+++ b/buildset-config.controller/nightly-x86-lsb.conf
@@ -3,9 +3,6 @@ builders: 'example-worker'
repos: [{'poky':
{'repourl':'git://git.yoctoproject.org/poky',
'layerversion':{'core':'meta', 'yoctobsp':'meta-yocto-bsp'},
- 'branch':'master'}},
- {'meta-qt3':
- {'repourl':'git://git.yoctoproject.org/meta-qt3',
'branch':'master'}}]
steps: [{'SetDest':{}},
{'CheckOutLayers': {}},
@@ -16,7 +13,7 @@ steps: [{'SetDest':{}},
{'CreateBBLayersConf': {'buildprovider' : 'yocto'}},
{'SyncPersistDB' : {'distro' : 'poky-lsb'}},
{'GetBitbakeVersion': {}},
- {'BuildImages': {'images': 'core-image-lsb core-image-lsb-dev core-image-lsb-sdk core-image-lsb-qt3'}},
+ {'BuildImages': {'images': 'core-image-lsb core-image-lsb-dev core-image-lsb-sdk'}},
{'CreateAutoConf': {'machine': 'genericx86', 'SDKMACHINE' : 'i686',
'buildhistory' : False, 'distro': 'poky-lsb'}},
{'BuildImages': {'images': 'core-image-lsb core-image-lsb-sdk'}},
diff --git a/buildset-config.controller/nightly.conf b/buildset-config.controller/nightly.conf
index d4a8275..67b12f2 100644
--- a/buildset-config.controller/nightly.conf
+++ b/buildset-config.controller/nightly.conf
@@ -36,10 +36,7 @@ repos: [{'poky':
{'eclipse-poky-mars':
{'repourl':'git://git.yoctoproject.org/eclipse-poky',
'checkout':False,
- 'branch':'mars-master'}},
- {'meta-qt3':
- {'repourl':'git://git.yoctoproject.org/meta-qt3',
- 'branch':'master'}}]
+ 'branch':'mars-master'}}]
props: [{'release_me':{'prop_type':'ChoiceStringParameter',
'choices': ['False', 'True'],
'name': 'release_me',
--
2.1.4
More information about the yocto
mailing list