diff options
Diffstat (limited to 'bitbake/lib/bb/cooker.py')
-rw-r--r-- | bitbake/lib/bb/cooker.py | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py index 1b6ee3032c..32a529f0f9 100644 --- a/bitbake/lib/bb/cooker.py +++ b/bitbake/lib/bb/cooker.py | |||
@@ -425,7 +425,7 @@ class BBCooker: | |||
425 | sock = socket.create_connection(upstream.split(":"), 5) | 425 | sock = socket.create_connection(upstream.split(":"), 5) |
426 | sock.close() | 426 | sock.close() |
427 | except socket.error as e: | 427 | except socket.error as e: |
428 | bb.warn("BB_HASHSERVE_UPSTREAM is not valid, unable to connect hash equivalence server at '%s': %s" | 428 | bb.warn("BB_HASHSERVE_UPSTREAM is not valid, unable to connect hash equivalence server at '%s': %s" |
429 | % (upstream, repr(e))) | 429 | % (upstream, repr(e))) |
430 | 430 | ||
431 | self.hashservaddr = "unix://%s/hashserve.sock" % self.data.getVar("TOPDIR") | 431 | self.hashservaddr = "unix://%s/hashserve.sock" % self.data.getVar("TOPDIR") |
@@ -1277,15 +1277,15 @@ class BBCooker: | |||
1277 | except bb.utils.VersionStringException as vse: | 1277 | except bb.utils.VersionStringException as vse: |
1278 | bb.fatal('Error parsing LAYERRECOMMENDS_%s: %s' % (c, str(vse))) | 1278 | bb.fatal('Error parsing LAYERRECOMMENDS_%s: %s' % (c, str(vse))) |
1279 | if not res: | 1279 | if not res: |
1280 | parselog.debug(3,"Layer '%s' recommends version %s of layer '%s', but version %s is currently enabled in your configuration. Check that you are using the correct matching versions/branches of these two layers.", c, opstr, rec, layerver) | 1280 | parselog.debug3("Layer '%s' recommends version %s of layer '%s', but version %s is currently enabled in your configuration. Check that you are using the correct matching versions/branches of these two layers.", c, opstr, rec, layerver) |
1281 | continue | 1281 | continue |
1282 | else: | 1282 | else: |
1283 | parselog.debug(3,"Layer '%s' recommends version %s of layer '%s', which exists in your configuration but does not specify a version. Check that you are using the correct matching versions/branches of these two layers.", c, opstr, rec) | 1283 | parselog.debug3("Layer '%s' recommends version %s of layer '%s', which exists in your configuration but does not specify a version. Check that you are using the correct matching versions/branches of these two layers.", c, opstr, rec) |
1284 | continue | 1284 | continue |
1285 | parselog.debug(3,"Layer '%s' recommends layer '%s', so we are adding it", c, rec) | 1285 | parselog.debug3("Layer '%s' recommends layer '%s', so we are adding it", c, rec) |
1286 | collection_depends[c].append(rec) | 1286 | collection_depends[c].append(rec) |
1287 | else: | 1287 | else: |
1288 | parselog.debug(3,"Layer '%s' recommends layer '%s', but this layer is not enabled in your configuration", c, rec) | 1288 | parselog.debug3("Layer '%s' recommends layer '%s', but this layer is not enabled in your configuration", c, rec) |
1289 | 1289 | ||
1290 | # Recursively work out collection priorities based on dependencies | 1290 | # Recursively work out collection priorities based on dependencies |
1291 | def calc_layer_priority(collection): | 1291 | def calc_layer_priority(collection): |
@@ -1297,7 +1297,7 @@ class BBCooker: | |||
1297 | if depprio > max_depprio: | 1297 | if depprio > max_depprio: |
1298 | max_depprio = depprio | 1298 | max_depprio = depprio |
1299 | max_depprio += 1 | 1299 | max_depprio += 1 |
1300 | parselog.debug(1, "Calculated priority of layer %s as %d", collection, max_depprio) | 1300 | parselog.debug("Calculated priority of layer %s as %d", collection, max_depprio) |
1301 | collection_priorities[collection] = max_depprio | 1301 | collection_priorities[collection] = max_depprio |
1302 | 1302 | ||
1303 | # Calculate all layer priorities using calc_layer_priority and store in bbfile_config_priorities | 1303 | # Calculate all layer priorities using calc_layer_priority and store in bbfile_config_priorities |
@@ -1309,7 +1309,7 @@ class BBCooker: | |||
1309 | errors = True | 1309 | errors = True |
1310 | continue | 1310 | continue |
1311 | elif regex == "": | 1311 | elif regex == "": |
1312 | parselog.debug(1, "BBFILE_PATTERN_%s is empty" % c) | 1312 | parselog.debug("BBFILE_PATTERN_%s is empty" % c) |
1313 | cre = re.compile('^NULL$') | 1313 | cre = re.compile('^NULL$') |
1314 | errors = False | 1314 | errors = False |
1315 | else: | 1315 | else: |
@@ -1678,7 +1678,7 @@ class BBCooker: | |||
1678 | self.state = state.parsing | 1678 | self.state = state.parsing |
1679 | 1679 | ||
1680 | if not self.parser.parse_next(): | 1680 | if not self.parser.parse_next(): |
1681 | collectlog.debug(1, "parsing complete") | 1681 | collectlog.debug("parsing complete") |
1682 | if self.parser.error: | 1682 | if self.parser.error: |
1683 | raise bb.BBHandledException() | 1683 | raise bb.BBHandledException() |
1684 | self.show_appends_with_no_recipes() | 1684 | self.show_appends_with_no_recipes() |
@@ -1723,7 +1723,7 @@ class BBCooker: | |||
1723 | 1723 | ||
1724 | if 'universe' in pkgs_to_build: | 1724 | if 'universe' in pkgs_to_build: |
1725 | parselog.verbnote("The \"universe\" target is only intended for testing and may produce errors.") | 1725 | parselog.verbnote("The \"universe\" target is only intended for testing and may produce errors.") |
1726 | parselog.debug(1, "collating packages for \"universe\"") | 1726 | parselog.debug("collating packages for \"universe\"") |
1727 | pkgs_to_build.remove('universe') | 1727 | pkgs_to_build.remove('universe') |
1728 | for mc in self.multiconfigs: | 1728 | for mc in self.multiconfigs: |
1729 | for t in self.recipecaches[mc].universe_target: | 1729 | for t in self.recipecaches[mc].universe_target: |
@@ -1836,7 +1836,7 @@ class CookerCollectFiles(object): | |||
1836 | """Collect all available .bb build files""" | 1836 | """Collect all available .bb build files""" |
1837 | masked = 0 | 1837 | masked = 0 |
1838 | 1838 | ||
1839 | collectlog.debug(1, "collecting .bb files") | 1839 | collectlog.debug("collecting .bb files") |
1840 | 1840 | ||
1841 | files = (config.getVar( "BBFILES") or "").split() | 1841 | files = (config.getVar( "BBFILES") or "").split() |
1842 | 1842 | ||
@@ -1923,7 +1923,7 @@ class CookerCollectFiles(object): | |||
1923 | bbappend = [] | 1923 | bbappend = [] |
1924 | for f in newfiles: | 1924 | for f in newfiles: |
1925 | if bbmask and bbmask_compiled.search(f): | 1925 | if bbmask and bbmask_compiled.search(f): |
1926 | collectlog.debug(1, "skipping masked file %s", f) | 1926 | collectlog.debug("skipping masked file %s", f) |
1927 | masked += 1 | 1927 | masked += 1 |
1928 | continue | 1928 | continue |
1929 | if f.endswith('.bb'): | 1929 | if f.endswith('.bb'): |
@@ -1931,7 +1931,7 @@ class CookerCollectFiles(object): | |||
1931 | elif f.endswith('.bbappend'): | 1931 | elif f.endswith('.bbappend'): |
1932 | bbappend.append(f) | 1932 | bbappend.append(f) |
1933 | else: | 1933 | else: |
1934 | collectlog.debug(1, "skipping %s: unknown file extension", f) | 1934 | collectlog.debug("skipping %s: unknown file extension", f) |
1935 | 1935 | ||
1936 | # Build a list of .bbappend files for each .bb file | 1936 | # Build a list of .bbappend files for each .bb file |
1937 | for f in bbappend: | 1937 | for f in bbappend: |