summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-05-12 16:53:22 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2009-05-12 16:53:22 +0100
commit81ff3a90f8f4ee0a00c439be9a1438de6c2ec168 (patch)
tree2bfed600f98fc2095ff7cfcf974e012627e826fc /bitbake
parent22a4c4d02fa9a90903361780b0492c5d8e488af8 (diff)
downloadpoky-81ff3a90f8f4ee0a00c439be9a1438de6c2ec168.tar.gz
bitbake: Update to work without warnings with python 2.6
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'bitbake')
-rw-r--r--bitbake/lib/bb/COW.py4
-rw-r--r--bitbake/lib/bb/cache.py3
-rw-r--r--bitbake/lib/bb/cooker.py5
-rw-r--r--bitbake/lib/bb/data_smart.py5
-rw-r--r--bitbake/lib/bb/runqueue.py7
5 files changed, 10 insertions, 14 deletions
diff --git a/bitbake/lib/bb/COW.py b/bitbake/lib/bb/COW.py
index e5063d60a8..5db41776ec 100644
--- a/bitbake/lib/bb/COW.py
+++ b/bitbake/lib/bb/COW.py
@@ -26,7 +26,7 @@
26from inspect import getmro 26from inspect import getmro
27 27
28import copy 28import copy
29import types, sets 29import types
30types.ImmutableTypes = tuple([ \ 30types.ImmutableTypes = tuple([ \
31 types.BooleanType, \ 31 types.BooleanType, \
32 types.ComplexType, \ 32 types.ComplexType, \
@@ -35,7 +35,7 @@ types.ImmutableTypes = tuple([ \
35 types.LongType, \ 35 types.LongType, \
36 types.NoneType, \ 36 types.NoneType, \
37 types.TupleType, \ 37 types.TupleType, \
38 sets.ImmutableSet] + \ 38 frozenset] + \
39 list(types.StringTypes)) 39 list(types.StringTypes))
40 40
41MUTABLE = "__mutable__" 41MUTABLE = "__mutable__"
diff --git a/bitbake/lib/bb/cache.py b/bitbake/lib/bb/cache.py
index 1001012e0c..272619386a 100644
--- a/bitbake/lib/bb/cache.py
+++ b/bitbake/lib/bb/cache.py
@@ -31,7 +31,6 @@
31import os, re 31import os, re
32import bb.data 32import bb.data
33import bb.utils 33import bb.utils
34from sets import Set
35 34
36try: 35try:
37 import cPickle as pickle 36 import cPickle as pickle
@@ -525,6 +524,6 @@ class CacheData:
525 (set elsewhere) 524 (set elsewhere)
526 """ 525 """
527 self.ignored_dependencies = [] 526 self.ignored_dependencies = []
528 self.world_target = Set() 527 self.world_target = set()
529 self.bbfile_priority = {} 528 self.bbfile_priority = {}
530 self.bbfile_config_priorities = [] 529 self.bbfile_config_priorities = []
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
index 610824ab21..1f31d1203a 100644
--- a/bitbake/lib/bb/cooker.py
+++ b/bitbake/lib/bb/cooker.py
@@ -25,7 +25,6 @@
25import sys, os, getopt, glob, copy, os.path, re, time 25import sys, os, getopt, glob, copy, os.path, re, time
26import bb 26import bb
27from bb import utils, data, parse, event, cache, providers, taskdata, runqueue 27from bb import utils, data, parse, event, cache, providers, taskdata, runqueue
28from sets import Set
29import itertools, sre_constants 28import itertools, sre_constants
30 29
31parsespin = itertools.cycle( r'|/-\\' ) 30parsespin = itertools.cycle( r'|/-\\' )
@@ -482,7 +481,7 @@ class BBCooker:
482 481
483 # Tweak some variables 482 # Tweak some variables
484 item = self.bb_cache.getVar('PN', fn, True) 483 item = self.bb_cache.getVar('PN', fn, True)
485 self.status.ignored_dependencies = Set() 484 self.status.ignored_dependencies = set()
486 self.status.bbfile_priority[fn] = 1 485 self.status.bbfile_priority[fn] = 1
487 486
488 # Remove external dependencies 487 # Remove external dependencies
@@ -574,7 +573,7 @@ class BBCooker:
574 self.status = bb.cache.CacheData() 573 self.status = bb.cache.CacheData()
575 574
576 ignore = bb.data.getVar("ASSUME_PROVIDED", self.configuration.data, 1) or "" 575 ignore = bb.data.getVar("ASSUME_PROVIDED", self.configuration.data, 1) or ""
577 self.status.ignored_dependencies = Set( ignore.split() ) 576 self.status.ignored_dependencies = set( ignore.split() )
578 577
579 self.handleCollections( bb.data.getVar("BBFILE_COLLECTIONS", self.configuration.data, 1) ) 578 self.handleCollections( bb.data.getVar("BBFILE_COLLECTIONS", self.configuration.data, 1) )
580 579
diff --git a/bitbake/lib/bb/data_smart.py b/bitbake/lib/bb/data_smart.py
index 0d39d20a45..c93aea7fef 100644
--- a/bitbake/lib/bb/data_smart.py
+++ b/bitbake/lib/bb/data_smart.py
@@ -32,7 +32,6 @@ import copy, os, re, sys, time, types
32import bb 32import bb
33from bb import utils, methodpool 33from bb import utils, methodpool
34from COW import COWDictBase 34from COW import COWDictBase
35from sets import Set
36from new import classobj 35from new import classobj
37 36
38 37
@@ -142,7 +141,7 @@ class DataSmart:
142 try: 141 try:
143 self._special_values[keyword].add( base ) 142 self._special_values[keyword].add( base )
144 except: 143 except:
145 self._special_values[keyword] = Set() 144 self._special_values[keyword] = set()
146 self._special_values[keyword].add( base ) 145 self._special_values[keyword].add( base )
147 146
148 return 147 return
@@ -154,7 +153,7 @@ class DataSmart:
154 if '_' in var: 153 if '_' in var:
155 override = var[var.rfind('_')+1:] 154 override = var[var.rfind('_')+1:]
156 if not self._seen_overrides.has_key(override): 155 if not self._seen_overrides.has_key(override):
157 self._seen_overrides[override] = Set() 156 self._seen_overrides[override] = set()
158 self._seen_overrides[override].add( var ) 157 self._seen_overrides[override].add( var )
159 158
160 # setting var 159 # setting var
diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py
index 2df51de75a..9b3cbdf5db 100644
--- a/bitbake/lib/bb/runqueue.py
+++ b/bitbake/lib/bb/runqueue.py
@@ -23,7 +23,6 @@ Handles preparation and execution of a queue of tasks
23# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. 23# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
24 24
25from bb import msg, data, event, mkdirhier, utils 25from bb import msg, data, event, mkdirhier, utils
26from sets import Set
27import bb, os, sys 26import bb, os, sys
28import signal 27import signal
29import stat 28import stat
@@ -525,8 +524,8 @@ class RunQueue:
525 524
526 self.runq_fnid.append(taskData.tasks_fnid[task]) 525 self.runq_fnid.append(taskData.tasks_fnid[task])
527 self.runq_task.append(taskData.tasks_name[task]) 526 self.runq_task.append(taskData.tasks_name[task])
528 self.runq_depends.append(Set(depends)) 527 self.runq_depends.append(set(depends))
529 self.runq_revdeps.append(Set()) 528 self.runq_revdeps.append(set())
530 529
531 runq_build.append(0) 530 runq_build.append(0)
532 531
@@ -622,7 +621,7 @@ class RunQueue:
622 if maps[origdep] == -1: 621 if maps[origdep] == -1:
623 bb.msg.fatal(bb.msg.domain.RunQueue, "Invalid mapping - Should never happen!") 622 bb.msg.fatal(bb.msg.domain.RunQueue, "Invalid mapping - Should never happen!")
624 newdeps.append(maps[origdep]) 623 newdeps.append(maps[origdep])
625 self.runq_depends[listid] = Set(newdeps) 624 self.runq_depends[listid] = set(newdeps)
626 625
627 bb.msg.note(2, bb.msg.domain.RunQueue, "Assign Weightings") 626 bb.msg.note(2, bb.msg.domain.RunQueue, "Assign Weightings")
628 627