diff options
Diffstat (limited to 'bitbake/lib/bb/cookerdata.py')
-rw-r--r-- | bitbake/lib/bb/cookerdata.py | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/bitbake/lib/bb/cookerdata.py b/bitbake/lib/bb/cookerdata.py index 472423fdc8..30727bf2ee 100644 --- a/bitbake/lib/bb/cookerdata.py +++ b/bitbake/lib/bb/cookerdata.py | |||
@@ -58,11 +58,14 @@ class ConfigParameters(object): | |||
58 | def updateToServer(self, server, environment): | 58 | def updateToServer(self, server, environment): |
59 | options = {} | 59 | options = {} |
60 | for o in ["abort", "force", "invalidate_stamp", | 60 | for o in ["abort", "force", "invalidate_stamp", |
61 | "verbose", "debug", "dry_run", "dump_signatures", | 61 | "debug", "dry_run", "dump_signatures", |
62 | "debug_domains", "extra_assume_provided", "profile", | 62 | "debug_domains", "extra_assume_provided", "profile", |
63 | "prefile", "postfile", "server_timeout"]: | 63 | "prefile", "postfile", "server_timeout"]: |
64 | options[o] = getattr(self.options, o) | 64 | options[o] = getattr(self.options, o) |
65 | 65 | ||
66 | options['build_verbose_shell'] = self.options.verbose | ||
67 | options['build_verbose_stdout'] = self.options.verbose | ||
68 | |||
66 | ret, error = server.runCommand(["updateConfig", options, environment, sys.argv]) | 69 | ret, error = server.runCommand(["updateConfig", options, environment, sys.argv]) |
67 | if error: | 70 | if error: |
68 | raise Exception("Unable to update the server configuration with local parameters: %s" % error) | 71 | raise Exception("Unable to update the server configuration with local parameters: %s" % error) |
@@ -125,6 +128,8 @@ class CookerConfiguration(object): | |||
125 | self.skipsetscene = False | 128 | self.skipsetscene = False |
126 | self.invalidate_stamp = False | 129 | self.invalidate_stamp = False |
127 | self.dump_signatures = [] | 130 | self.dump_signatures = [] |
131 | self.build_verbose_shell = False | ||
132 | self.build_verbose_stdout = False | ||
128 | self.dry_run = False | 133 | self.dry_run = False |
129 | self.tracking = False | 134 | self.tracking = False |
130 | self.xmlrpcinterface = [] | 135 | self.xmlrpcinterface = [] |
@@ -297,6 +302,8 @@ class CookerDataBuilder(object): | |||
297 | 302 | ||
298 | multiconfig = (self.data.getVar("BBMULTICONFIG") or "").split() | 303 | multiconfig = (self.data.getVar("BBMULTICONFIG") or "").split() |
299 | for config in multiconfig: | 304 | for config in multiconfig: |
305 | if config[0].isdigit(): | ||
306 | bb.fatal("Multiconfig name '%s' is invalid as multiconfigs cannot start with a digit" % config) | ||
300 | mcdata = self.parseConfigurationFiles(self.prefiles, self.postfiles, config) | 307 | mcdata = self.parseConfigurationFiles(self.prefiles, self.postfiles, config) |
301 | bb.event.fire(bb.event.ConfigParsed(), mcdata) | 308 | bb.event.fire(bb.event.ConfigParsed(), mcdata) |
302 | self.mcdata[config] = mcdata | 309 | self.mcdata[config] = mcdata |
@@ -348,6 +355,9 @@ class CookerDataBuilder(object): | |||
348 | layers = (data.getVar('BBLAYERS') or "").split() | 355 | layers = (data.getVar('BBLAYERS') or "").split() |
349 | broken_layers = [] | 356 | broken_layers = [] |
350 | 357 | ||
358 | if not layers: | ||
359 | bb.fatal("The bblayers.conf file doesn't contain any BBLAYERS definition") | ||
360 | |||
351 | data = bb.data.createCopy(data) | 361 | data = bb.data.createCopy(data) |
352 | approved = bb.utils.approved_variables() | 362 | approved = bb.utils.approved_variables() |
353 | 363 | ||
@@ -399,6 +409,8 @@ class CookerDataBuilder(object): | |||
399 | if c in collections_tmp: | 409 | if c in collections_tmp: |
400 | bb.fatal("Found duplicated BBFILE_COLLECTIONS '%s', check bblayers.conf or layer.conf to fix it." % c) | 410 | bb.fatal("Found duplicated BBFILE_COLLECTIONS '%s', check bblayers.conf or layer.conf to fix it." % c) |
401 | compat = set((data.getVar("LAYERSERIES_COMPAT_%s" % c) or "").split()) | 411 | compat = set((data.getVar("LAYERSERIES_COMPAT_%s" % c) or "").split()) |
412 | if compat and not layerseries: | ||
413 | bb.fatal("No core layer found to work with layer '%s'. Missing entry in bblayers.conf?" % c) | ||
402 | if compat and not (compat & layerseries): | 414 | if compat and not (compat & layerseries): |
403 | bb.fatal("Layer %s is not compatible with the core layer which only supports these series: %s (layer is compatible with %s)" | 415 | bb.fatal("Layer %s is not compatible with the core layer which only supports these series: %s (layer is compatible with %s)" |
404 | % (c, " ".join(layerseries), " ".join(compat))) | 416 | % (c, " ".join(layerseries), " ".join(compat))) |