summaryrefslogtreecommitdiffstats
path: root/bitbake/bin
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2012-01-08 12:06:49 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-01-10 17:40:42 (GMT)
commit4137b51f634bd0c7dec80701181dc3af79afbd71 (patch)
treeee36e745fb3cd5dfab5b00ab9901eef39b46ee9f /bitbake/bin
parent89f2d11561c225a875b5691aaadc936490fab5a6 (diff)
downloadpoky-4137b51f634bd0c7dec80701181dc3af79afbd71.tar.gz
bitbake-layers: flatten: allow specifying layers to flatten
You can now optionally specify two or more layers to flatten into the output, rather than flattening all of the layers in the current configuration (but this is still the default behaviour if no layers are specified). Note that this means the output layer may still contain bbappends where the corresponding recipes are not present in the list of layers to flatten. There is also a caveat when a layer not being flattened would be "inbetween" the flattened layers (see the command help for details.) Implements feature request in [YOCTO #1564]. (Bitbake rev: 379b12107ec921b4458eda320078374a509164c1) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/bin')
-rwxr-xr-xbitbake/bin/bitbake-layers75
1 files changed, 67 insertions, 8 deletions
diff --git a/bitbake/bin/bitbake-layers b/bitbake/bin/bitbake-layers
index b2781bb..572487d 100755
--- a/bitbake/bin/bitbake-layers
+++ b/bitbake/bin/bitbake-layers
@@ -139,9 +139,10 @@ Highest priority recipes are listed with the recipes they overlay as subitems.
139 def do_flatten(self, args): 139 def do_flatten(self, args):
140 """flattens layer configuration into a separate output directory. 140 """flattens layer configuration into a separate output directory.
141 141
142usage: flatten <outputdir> 142usage: flatten [layer1 layer2 [layer3]...] <outputdir>
143 143
144Takes the current layer configuration and builds a "flattened" directory 144Takes the specified layers (or all layers in the current layer
145configuration if none are specified) and builds a "flattened" directory
145containing the contents of all layers, with any overlayed recipes removed 146containing the contents of all layers, with any overlayed recipes removed
146and bbappends appended to the corresponding recipes. Note that some manual 147and bbappends appended to the corresponding recipes. Note that some manual
147cleanup may still be necessary afterwards, in particular: 148cleanup may still be necessary afterwards, in particular:
@@ -149,21 +150,59 @@ cleanup may still be necessary afterwards, in particular:
149* where non-recipe files (such as patches) are overwritten (the flatten 150* where non-recipe files (such as patches) are overwritten (the flatten
150 command will show a warning for these) 151 command will show a warning for these)
151* where anything beyond the normal layer setup has been added to 152* where anything beyond the normal layer setup has been added to
152 layer.conf (only the lowest priority layer's layer.conf is used) 153 layer.conf (only the lowest priority number layer's layer.conf is used)
153* overridden/appended items from bbappends will need to be tidied up 154* overridden/appended items from bbappends will need to be tidied up
155
156Warning: if you flatten several layers where another layer is intended to
157be used "inbetween" them (in layer priority order) such that recipes /
158bbappends in the layers interact, and then attempt to use the new output
159layer together with that other layer, you may no longer get the same
160build results (as the layer priority order has effectively changed).
154""" 161"""
155 arglist = args.split() 162 arglist = args.split()
156 if len(arglist) != 1: 163 if len(arglist) < 1:
157 logger.error('Please specify an output directory') 164 logger.error('Please specify an output directory')
158 self.do_help('flatten') 165 self.do_help('flatten')
159 return 166 return
160 167
161 if os.path.exists(arglist[0]) and os.listdir(arglist[0]): 168 if len(arglist) == 2:
162 logger.error('Directory %s exists and is non-empty, please clear it out first' % arglist[0]) 169 logger.error('If you specify layers to flatten you must specify at least two')
170 self.do_help('flatten')
171 return
172
173 outputdir = arglist[-1]
174 if os.path.exists(outputdir) and os.listdir(outputdir):
175 logger.error('Directory %s exists and is non-empty, please clear it out first' % outputdir)
163 return 176 return
164 177
165 self.check_prepare_cooker() 178 self.check_prepare_cooker()
166 layers = (self.config_data.getVar('BBLAYERS', True) or "").split() 179 layers = (self.config_data.getVar('BBLAYERS', True) or "").split()
180 if len(arglist) > 2:
181 layernames = arglist[:-1]
182 found_layernames = []
183 found_layerdirs = []
184 for layerdir in layers:
185 for layername, _, regex, _ in self.cooker.status.bbfile_config_priorities:
186 if layername in layernames:
187 if regex.match(os.path.join(layerdir, 'test')):
188 found_layerdirs.append(layerdir)
189 found_layernames.append(layername)
190 break
191
192 for layername in layernames:
193 if not layername in found_layernames:
194 logger.error('Unable to find layer %s in current configuration, please run "%s show_layers" to list configured layers' % (layername, os.path.basename(sys.argv[0])))
195 return
196 layers = found_layerdirs
197
198 # Ensure a specified path matches our list of layers
199 def layer_path_match(path):
200 for layerdir in layers:
201 if path.startswith(os.path.join(layerdir, '')):
202 return layerdir
203 return None
204
205 appended_recipes = []
167 for layer in layers: 206 for layer in layers:
168 overlayed = [] 207 overlayed = []
169 for f in self.cooker.overlayed.iterkeys(): 208 for f in self.cooker.overlayed.iterkeys():
@@ -181,7 +220,7 @@ cleanup may still be necessary afterwards, in particular:
181 ext = os.path.splitext(f1)[1] 220 ext = os.path.splitext(f1)[1]
182 if ext != '.bbappend': 221 if ext != '.bbappend':
183 fdest = f1full[len(layer):] 222 fdest = f1full[len(layer):]
184 fdest = os.path.normpath(os.sep.join([arglist[0],fdest])) 223 fdest = os.path.normpath(os.sep.join([outputdir,fdest]))
185 bb.utils.mkdirhier(os.path.dirname(fdest)) 224 bb.utils.mkdirhier(os.path.dirname(fdest))
186 if os.path.exists(fdest): 225 if os.path.exists(fdest):
187 if f1 == 'layer.conf' and root.endswith('/conf'): 226 if f1 == 'layer.conf' and root.endswith('/conf'):
@@ -196,7 +235,27 @@ cleanup may still be necessary afterwards, in particular:
196 if appends: 235 if appends:
197 logger.plain(' Applying appends to %s' % fdest ) 236 logger.plain(' Applying appends to %s' % fdest )
198 for appendname in appends: 237 for appendname in appends:
199 self.apply_append(appendname, fdest) 238 if layer_path_match(appendname):
239 self.apply_append(appendname, fdest)
240 appended_recipes.append(f1)
241
242 # Take care of when some layers are excluded and yet we have included bbappends for those recipes
243 for recipename in self.cooker_data.appends.iterkeys():
244 if recipename not in appended_recipes:
245 appends = self.cooker_data.appends[recipename]
246 first_append = None
247 for appendname in appends:
248 layer = layer_path_match(appendname)
249 if layer:
250 if first_append:
251 self.apply_append(appendname, first_append)
252 else:
253 fdest = appendname[len(layer):]
254 fdest = os.path.normpath(os.sep.join([outputdir,fdest]))
255 bb.utils.mkdirhier(os.path.dirname(fdest))
256 bb.utils.copyfile(appendname, fdest)
257 first_append = fdest
258
200 259
201 def get_append_layer(self, appendname): 260 def get_append_layer(self, appendname):
202 for layer, _, regex, _ in self.cooker.status.bbfile_config_priorities: 261 for layer, _, regex, _ in self.cooker.status.bbfile_config_priorities: