summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-03 10:41:41 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-05 10:36:53 -0800
commitff73b02a7203623e5edfaaa10df17eaa63cf4ed3 (patch)
treed32fbf33c74a0a9c60f3676d1aa46bb6812fa757 /bitbake/lib/bb
parent082cc604f5eb1a7f6d3c4dda01154cfa93b0d660 (diff)
downloadpoky-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')
-rw-r--r--bitbake/lib/bb/build.py4
-rw-r--r--bitbake/lib/bb/cooker.py18
-rw-r--r--bitbake/lib/bb/data_smart.py2
-rw-r--r--bitbake/lib/bb/fetch/__init__.py10
-rw-r--r--bitbake/lib/bb/monitordisk.py4
-rw-r--r--bitbake/lib/bb/parse/parse_py/ConfHandler.py2
-rw-r--r--bitbake/lib/bb/providers.py4
-rw-r--r--bitbake/lib/bb/runqueue.py8
8 files changed, 26 insertions, 26 deletions
diff --git a/bitbake/lib/bb/build.py b/bitbake/lib/bb/build.py
index a9b40e729d..736ba24393 100644
--- a/bitbake/lib/bb/build.py
+++ b/bitbake/lib/bb/build.py
@@ -70,9 +70,9 @@ class TaskBase(event.Event):
70 70
71 def __init__(self, t, d ): 71 def __init__(self, t, d ):
72 self._task = t 72 self._task = t
73 self._package = d.getVar("PF", 1) 73 self._package = d.getVar("PF", True)
74 event.Event.__init__(self) 74 event.Event.__init__(self)
75 self._message = "package %s: task %s: %s" % (d.getVar("PF", 1), t, self.getDisplayName()) 75 self._message = "package %s: task %s: %s" % (d.getVar("PF", True), t, self.getDisplayName())
76 76
77 def getTask(self): 77 def getTask(self):
78 return self._task 78 return self._task
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:
diff --git a/bitbake/lib/bb/data_smart.py b/bitbake/lib/bb/data_smart.py
index 7765f81b52..2c200db32b 100644
--- a/bitbake/lib/bb/data_smart.py
+++ b/bitbake/lib/bb/data_smart.py
@@ -58,7 +58,7 @@ class VariableParse:
58 if self.varname and key: 58 if self.varname and key:
59 if self.varname == key: 59 if self.varname == key:
60 raise Exception("variable %s references itself!" % self.varname) 60 raise Exception("variable %s references itself!" % self.varname)
61 var = self.d.getVar(key, 1) 61 var = self.d.getVar(key, True)
62 if var is not None: 62 if var is not None:
63 self.references.add(key) 63 self.references.add(key)
64 return var 64 return var
diff --git a/bitbake/lib/bb/fetch/__init__.py b/bitbake/lib/bb/fetch/__init__.py
index ea98019207..18988646b9 100644
--- a/bitbake/lib/bb/fetch/__init__.py
+++ b/bitbake/lib/bb/fetch/__init__.py
@@ -154,7 +154,7 @@ def fetcher_init(d):
154 Calls before this must not hit the cache. 154 Calls before this must not hit the cache.
155 """ 155 """
156 # When to drop SCM head revisions controlled by user policy 156 # When to drop SCM head revisions controlled by user policy
157 srcrev_policy = d.getVar('BB_SRCREV_POLICY', 1) or "clear" 157 srcrev_policy = d.getVar('BB_SRCREV_POLICY', True) or "clear"
158 if srcrev_policy == "cache": 158 if srcrev_policy == "cache":
159 logger.debug(1, "Keeping SRCREV cache due to cache policy of: %s", srcrev_policy) 159 logger.debug(1, "Keeping SRCREV cache due to cache policy of: %s", srcrev_policy)
160 elif srcrev_policy == "clear": 160 elif srcrev_policy == "clear":
@@ -200,7 +200,7 @@ def fetcher_compare_revisions(d):
200def init(urls, d, setup = True): 200def init(urls, d, setup = True):
201 urldata = {} 201 urldata = {}
202 202
203 fn = d.getVar('FILE', 1) 203 fn = d.getVar('FILE', True)
204 if fn in urldata_cache: 204 if fn in urldata_cache:
205 urldata = urldata_cache[fn] 205 urldata = urldata_cache[fn]
206 206
@@ -261,7 +261,7 @@ def go(d, urls = None):
261 init must have previously been called 261 init must have previously been called
262 """ 262 """
263 if not urls: 263 if not urls:
264 urls = d.getVar("SRC_URI", 1).split() 264 urls = d.getVar("SRC_URI", True).split()
265 urldata = init(urls, d, True) 265 urldata = init(urls, d, True)
266 266
267 for u in urls: 267 for u in urls:
@@ -383,7 +383,7 @@ def get_srcrev(d):
383 scms = [] 383 scms = []
384 384
385 # Only call setup_localpath on URIs which supports_srcrev() 385 # Only call setup_localpath on URIs which supports_srcrev()
386 urldata = init(d.getVar('SRC_URI', 1).split(), d, False) 386 urldata = init(d.getVar('SRC_URI', True).split(), d, False)
387 for u in urldata: 387 for u in urldata:
388 ud = urldata[u] 388 ud = urldata[u]
389 if ud.method.supports_srcrev(): 389 if ud.method.supports_srcrev():
@@ -404,7 +404,7 @@ def get_srcrev(d):
404 # 404 #
405 # Mutiple SCMs are in SRC_URI so we resort to SRCREV_FORMAT 405 # Mutiple SCMs are in SRC_URI so we resort to SRCREV_FORMAT
406 # 406 #
407 format = d.getVar('SRCREV_FORMAT', 1) 407 format = d.getVar('SRCREV_FORMAT', True)
408 if not format: 408 if not format:
409 logger.error("The SRCREV_FORMAT variable must be set when multiple SCMs are used.") 409 logger.error("The SRCREV_FORMAT variable must be set when multiple SCMs are used.")
410 raise ParameterError 410 raise ParameterError
diff --git a/bitbake/lib/bb/monitordisk.py b/bitbake/lib/bb/monitordisk.py
index 04f090cbe6..9baba5e73b 100644
--- a/bitbake/lib/bb/monitordisk.py
+++ b/bitbake/lib/bb/monitordisk.py
@@ -136,7 +136,7 @@ def getInterval(configuration):
136 136
137 """ Get the disk space interval """ 137 """ Get the disk space interval """
138 138
139 interval = configuration.getVar("BB_DISKMON_WARNINTERVAL", 1) 139 interval = configuration.getVar("BB_DISKMON_WARNINTERVAL", True)
140 if not interval: 140 if not interval:
141 # The default value is 50M and 5K. 141 # The default value is 50M and 5K.
142 return 50 * 1024 * 1024, 5 * 1024 142 return 50 * 1024 * 1024, 5 * 1024
@@ -170,7 +170,7 @@ class diskMonitor:
170 170
171 self.enableMonitor = False 171 self.enableMonitor = False
172 172
173 BBDirs = configuration.getVar("BB_DISKMON_DIRS", 1) or None 173 BBDirs = configuration.getVar("BB_DISKMON_DIRS", True) or None
174 if BBDirs: 174 if BBDirs:
175 self.devDict = getDiskData(BBDirs, configuration) 175 self.devDict = getDiskData(BBDirs, configuration)
176 if self.devDict: 176 if self.devDict:
diff --git a/bitbake/lib/bb/parse/parse_py/ConfHandler.py b/bitbake/lib/bb/parse/parse_py/ConfHandler.py
index 0e24b723f0..fa811f3828 100644
--- a/bitbake/lib/bb/parse/parse_py/ConfHandler.py
+++ b/bitbake/lib/bb/parse/parse_py/ConfHandler.py
@@ -58,7 +58,7 @@ def include(oldfn, fn, lineno, data, error_out):
58 58
59 if not os.path.isabs(fn): 59 if not os.path.isabs(fn):
60 dname = os.path.dirname(oldfn) 60 dname = os.path.dirname(oldfn)
61 bbpath = "%s:%s" % (dname, data.getVar("BBPATH", 1)) 61 bbpath = "%s:%s" % (dname, data.getVar("BBPATH", True))
62 abs_fn = bb.utils.which(bbpath, fn) 62 abs_fn = bb.utils.which(bbpath, fn)
63 if abs_fn: 63 if abs_fn:
64 fn = abs_fn 64 fn = abs_fn
diff --git a/bitbake/lib/bb/providers.py b/bitbake/lib/bb/providers.py
index 1dc6a8e8bf..bd729df93d 100644
--- a/bitbake/lib/bb/providers.py
+++ b/bitbake/lib/bb/providers.py
@@ -284,7 +284,7 @@ def filterProviders(providers, item, cfgData, dataCache):
284 284
285 eligible = _filterProviders(providers, item, cfgData, dataCache) 285 eligible = _filterProviders(providers, item, cfgData, dataCache)
286 286
287 prefervar = cfgData.getVar('PREFERRED_PROVIDER_%s' % item, 1) 287 prefervar = cfgData.getVar('PREFERRED_PROVIDER_%s' % item, True)
288 if prefervar: 288 if prefervar:
289 dataCache.preferred[item] = prefervar 289 dataCache.preferred[item] = prefervar
290 290
@@ -322,7 +322,7 @@ def filterProvidersRunTime(providers, item, cfgData, dataCache):
322 pn = dataCache.pkg_fn[p] 322 pn = dataCache.pkg_fn[p]
323 provides = dataCache.pn_provides[pn] 323 provides = dataCache.pn_provides[pn]
324 for provide in provides: 324 for provide in provides:
325 prefervar = cfgData.getVar('PREFERRED_PROVIDER_%s' % provide, 1) 325 prefervar = cfgData.getVar('PREFERRED_PROVIDER_%s' % provide, True)
326 logger.debug(1, "checking PREFERRED_PROVIDER_%s (value %s) against %s", provide, prefervar, pns.keys()) 326 logger.debug(1, "checking PREFERRED_PROVIDER_%s (value %s) against %s", provide, prefervar, pns.keys())
327 if prefervar in pns and pns[prefervar] not in preferred: 327 if prefervar in pns and pns[prefervar] not in preferred:
328 var = "PREFERRED_PROVIDER_%s = %s" % (provide, prefervar) 328 var = "PREFERRED_PROVIDER_%s = %s" % (provide, prefervar)
diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py
index f44c2ece92..bc0602700d 100644
--- a/bitbake/lib/bb/runqueue.py
+++ b/bitbake/lib/bb/runqueue.py
@@ -190,8 +190,8 @@ class RunQueueData:
190 self.rq = rq 190 self.rq = rq
191 self.warn_multi_bb = False 191 self.warn_multi_bb = False
192 192
193 self.stampwhitelist = cfgData.getVar("BB_STAMP_WHITELIST", 1) or "" 193 self.stampwhitelist = cfgData.getVar("BB_STAMP_WHITELIST", True) or ""
194 self.multi_provider_whitelist = (cfgData.getVar("MULTI_PROVIDER_WHITELIST", 1) or "").split() 194 self.multi_provider_whitelist = (cfgData.getVar("MULTI_PROVIDER_WHITELIST", True) or "").split()
195 195
196 self.reset() 196 self.reset()
197 197
@@ -1029,8 +1029,8 @@ class RunQueueExecute:
1029 self.cfgData = rq.cfgData 1029 self.cfgData = rq.cfgData
1030 self.rqdata = rq.rqdata 1030 self.rqdata = rq.rqdata
1031 1031
1032 self.number_tasks = int(self.cfgData.getVar("BB_NUMBER_THREADS", 1) or 1) 1032 self.number_tasks = int(self.cfgData.getVar("BB_NUMBER_THREADS", True) or 1)
1033 self.scheduler = self.cfgData.getVar("BB_SCHEDULER", 1) or "speed" 1033 self.scheduler = self.cfgData.getVar("BB_SCHEDULER", True) or "speed"
1034 1034
1035 self.runq_buildable = [] 1035 self.runq_buildable = []
1036 self.runq_running = [] 1036 self.runq_running = []