diff options
author | Ed Bartosh <ed.bartosh@linux.intel.com> | 2016-04-06 17:46:21 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-04-06 23:10:28 +0100 |
commit | ab18c208b205bb5e536f7ed4093bacd071e2d8df (patch) | |
tree | 718d3c360bc3970c2e10e415d850a358033140f2 /bitbake/lib/toaster/bldcontrol/bbcontroller.py | |
parent | 22fba9b2b7982055b54c756cc5bdce05c4a42fdc (diff) | |
download | poky-ab18c208b205bb5e536f7ed4093bacd071e2d8df.tar.gz |
bitbake: toaster: modified setLayers API
Removed updating of bblayers.conf. It will be done in runBuild method.
Changed return value: return list of layers.
Removed _updateBBLayers method.
(Bitbake rev: 198bf7e6b8d7f847f2619b71c6bd86a9a76156c9)
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Michael Wood <michael.g.wood@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/toaster/bldcontrol/bbcontroller.py')
-rw-r--r-- | bitbake/lib/toaster/bldcontrol/bbcontroller.py | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/bitbake/lib/toaster/bldcontrol/bbcontroller.py b/bitbake/lib/toaster/bldcontrol/bbcontroller.py index 2ca26612d4..058e490fc1 100644 --- a/bitbake/lib/toaster/bldcontrol/bbcontroller.py +++ b/bitbake/lib/toaster/bldcontrol/bbcontroller.py | |||
@@ -109,24 +109,6 @@ class BuildEnvironmentController(object): | |||
109 | self.be = be | 109 | self.be = be |
110 | self.connection = None | 110 | self.connection = None |
111 | 111 | ||
112 | @staticmethod | ||
113 | def _updateBBLayers(bblayerconf, layerlist): | ||
114 | conflines = open(bblayerconf, "r").readlines() | ||
115 | |||
116 | bblayerconffile = open(bblayerconf, "w") | ||
117 | skip = 0 | ||
118 | for i in xrange(len(conflines)): | ||
119 | if skip > 0: | ||
120 | skip =- 1 | ||
121 | continue | ||
122 | if conflines[i].startswith("# line added by toaster"): | ||
123 | skip = 1 | ||
124 | else: | ||
125 | bblayerconffile.write(conflines[i]) | ||
126 | |||
127 | bblayerconffile.write("# line added by toaster build control\nBBLAYERS = \"" + " ".join(layerlist) + "\"") | ||
128 | bblayerconffile.close() | ||
129 | |||
130 | def setLayers(self, bitbake, ls): | 112 | def setLayers(self, bitbake, ls): |
131 | """ Checks-out bitbake executor and layers from git repositories. | 113 | """ Checks-out bitbake executor and layers from git repositories. |
132 | Sets the layer variables in the config file, after validating local layer paths. | 114 | Sets the layer variables in the config file, after validating local layer paths. |