diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-03-03 10:41:41 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-03-05 10:36:53 -0800 |
commit | ff73b02a7203623e5edfaaa10df17eaa63cf4ed3 (patch) | |
tree | d32fbf33c74a0a9c60f3676d1aa46bb6812fa757 /bitbake/lib/bb/cooker.py | |
parent | 082cc604f5eb1a7f6d3c4dda01154cfa93b0d660 (diff) | |
download | poky-ff73b02a7203623e5edfaaa10df17eaa63cf4ed3.tar.gz |
meta/classes: Convert to use appendVar and appendVarFlags
(From OE-Core rev: 3b57de68e70e77dbc03c0616a83a29a2e99e40b4)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/cooker.py')
-rw-r--r-- | bitbake/lib/bb/cooker.py | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py index 558eadd00f..a9d86836ec 100644 --- a/bitbake/lib/bb/cooker.py +++ b/bitbake/lib/bb/cooker.py | |||
@@ -298,7 +298,7 @@ class BBCooker: | |||
298 | # this showEnvironment() code path doesn't use the cache | 298 | # this showEnvironment() code path doesn't use the cache |
299 | self.parseConfiguration() | 299 | self.parseConfiguration() |
300 | self.status = bb.cache.CacheData(self.caches_array) | 300 | self.status = bb.cache.CacheData(self.caches_array) |
301 | self.handleCollections( self.configuration.data.getVar("BBFILE_COLLECTIONS", 1) ) | 301 | self.handleCollections( self.configuration.data.getVar("BBFILE_COLLECTIONS", True) ) |
302 | 302 | ||
303 | fn, cls = bb.cache.Cache.virtualfn2realfn(buildfile) | 303 | fn, cls = bb.cache.Cache.virtualfn2realfn(buildfile) |
304 | fn = self.matchFile(fn) | 304 | fn = self.matchFile(fn) |
@@ -882,7 +882,7 @@ class BBCooker: | |||
882 | min_prio = 0 | 882 | min_prio = 0 |
883 | for c in collection_list: | 883 | for c in collection_list: |
884 | # Get collection priority if defined explicitly | 884 | # Get collection priority if defined explicitly |
885 | priority = self.configuration.data.getVar("BBFILE_PRIORITY_%s" % c, 1) | 885 | priority = self.configuration.data.getVar("BBFILE_PRIORITY_%s" % c, True) |
886 | if priority: | 886 | if priority: |
887 | try: | 887 | try: |
888 | prio = int(priority) | 888 | prio = int(priority) |
@@ -896,7 +896,7 @@ class BBCooker: | |||
896 | collection_priorities[c] = None | 896 | collection_priorities[c] = None |
897 | 897 | ||
898 | # Check dependencies and store information for priority calculation | 898 | # Check dependencies and store information for priority calculation |
899 | deps = self.configuration.data.getVar("LAYERDEPENDS_%s" % c, 1) | 899 | deps = self.configuration.data.getVar("LAYERDEPENDS_%s" % c, True) |
900 | if deps: | 900 | if deps: |
901 | depnamelist = [] | 901 | depnamelist = [] |
902 | deplist = deps.split() | 902 | deplist = deps.split() |
@@ -916,7 +916,7 @@ class BBCooker: | |||
916 | 916 | ||
917 | if dep in collection_list: | 917 | if dep in collection_list: |
918 | if depver: | 918 | if depver: |
919 | layerver = self.configuration.data.getVar("LAYERVERSION_%s" % dep, 1) | 919 | layerver = self.configuration.data.getVar("LAYERVERSION_%s" % dep, True) |
920 | if layerver: | 920 | if layerver: |
921 | try: | 921 | try: |
922 | lver = int(layerver) | 922 | lver = int(layerver) |
@@ -953,7 +953,7 @@ class BBCooker: | |||
953 | # Calculate all layer priorities using calc_layer_priority and store in bbfile_config_priorities | 953 | # Calculate all layer priorities using calc_layer_priority and store in bbfile_config_priorities |
954 | for c in collection_list: | 954 | for c in collection_list: |
955 | calc_layer_priority(c) | 955 | calc_layer_priority(c) |
956 | regex = self.configuration.data.getVar("BBFILE_PATTERN_%s" % c, 1) | 956 | regex = self.configuration.data.getVar("BBFILE_PATTERN_%s" % c, True) |
957 | if regex == None: | 957 | if regex == None: |
958 | parselog.error("BBFILE_PATTERN_%s not defined" % c) | 958 | parselog.error("BBFILE_PATTERN_%s not defined" % c) |
959 | errors = True | 959 | errors = True |
@@ -1027,7 +1027,7 @@ class BBCooker: | |||
1027 | # buildFile() doesn't use the cache | 1027 | # buildFile() doesn't use the cache |
1028 | self.parseConfiguration() | 1028 | self.parseConfiguration() |
1029 | self.status = bb.cache.CacheData(self.caches_array) | 1029 | self.status = bb.cache.CacheData(self.caches_array) |
1030 | self.handleCollections( self.configuration.data.getVar("BBFILE_COLLECTIONS", 1) ) | 1030 | self.handleCollections( self.configuration.data.getVar("BBFILE_COLLECTIONS", True) ) |
1031 | 1031 | ||
1032 | # If we are told to do the None task then query the default task | 1032 | # If we are told to do the None task then query the default task |
1033 | if (task == None): | 1033 | if (task == None): |
@@ -1181,13 +1181,13 @@ class BBCooker: | |||
1181 | del self.status | 1181 | del self.status |
1182 | self.status = bb.cache.CacheData(self.caches_array) | 1182 | self.status = bb.cache.CacheData(self.caches_array) |
1183 | 1183 | ||
1184 | ignore = self.configuration.data.getVar("ASSUME_PROVIDED", 1) or "" | 1184 | ignore = self.configuration.data.getVar("ASSUME_PROVIDED", True) or "" |
1185 | self.status.ignored_dependencies = set(ignore.split()) | 1185 | self.status.ignored_dependencies = set(ignore.split()) |
1186 | 1186 | ||
1187 | for dep in self.configuration.extra_assume_provided: | 1187 | for dep in self.configuration.extra_assume_provided: |
1188 | self.status.ignored_dependencies.add(dep) | 1188 | self.status.ignored_dependencies.add(dep) |
1189 | 1189 | ||
1190 | self.handleCollections( self.configuration.data.getVar("BBFILE_COLLECTIONS", 1) ) | 1190 | self.handleCollections( self.configuration.data.getVar("BBFILE_COLLECTIONS", True) ) |
1191 | 1191 | ||
1192 | (filelist, masked) = self.collect_bbfiles() | 1192 | (filelist, masked) = self.collect_bbfiles() |
1193 | self.configuration.data.renameVar("__depends", "__base_depends") | 1193 | self.configuration.data.renameVar("__depends", "__base_depends") |
@@ -1282,7 +1282,7 @@ class BBCooker: | |||
1282 | if g not in newfiles: | 1282 | if g not in newfiles: |
1283 | newfiles.append(g) | 1283 | newfiles.append(g) |
1284 | 1284 | ||
1285 | bbmask = self.configuration.data.getVar('BBMASK', 1) | 1285 | bbmask = self.configuration.data.getVar('BBMASK', True) |
1286 | 1286 | ||
1287 | if bbmask: | 1287 | if bbmask: |
1288 | try: | 1288 | try: |