summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/classes/image.bbclass2
-rw-r--r--meta/classes/kernel-module-split.bbclass4
-rw-r--r--meta/lib/oe/prservice.py2
-rw-r--r--meta/lib/oe/qa.py2
-rw-r--r--meta/recipes-core/eglibc/eglibc-ld.inc2
5 files changed, 6 insertions, 6 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 979921f58c..251bc9abfd 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -368,7 +368,7 @@ for dir in dirs.split():
368 key=str(os.path.join("/",os.path.relpath(item,dir))) 368 key=str(os.path.join("/",os.path.relpath(item,dir)))
369 369
370 valid=True; 370 valid=True;
371 if files.has_key(key): 371 if key in files:
372 #check whether the file is allow to replace 372 #check whether the file is allow to replace
373 if allow_rep.match(key): 373 if allow_rep.match(key):
374 valid=True 374 valid=True
diff --git a/meta/classes/kernel-module-split.bbclass b/meta/classes/kernel-module-split.bbclass
index 45639c613c..9a4329dcc9 100644
--- a/meta/classes/kernel-module-split.bbclass
+++ b/meta/classes/kernel-module-split.bbclass
@@ -109,7 +109,7 @@ python split_kernel_module_packages () {
109 # instead is prefixed with /lib/modules/${KERNEL_VERSION} 109 # instead is prefixed with /lib/modules/${KERNEL_VERSION}
110 file = file.replace("/lib/modules/%s/" % d.getVar('KERNEL_VERSION', True) or '', '', 1) 110 file = file.replace("/lib/modules/%s/" % d.getVar('KERNEL_VERSION', True) or '', '', 1)
111 111
112 if module_deps.has_key(file): 112 if file in module_deps:
113 dependencies = [] 113 dependencies = []
114 for i in module_deps[file]: 114 for i in module_deps[file]:
115 m = re.match(pattern, os.path.basename(i)) 115 m = re.match(pattern, os.path.basename(i))
@@ -153,7 +153,7 @@ python split_kernel_module_packages () {
153 files = "%s /etc/modules-load.d/%s.conf /etc/modprobe.d/%s.conf" % (files, basename, basename) 153 files = "%s /etc/modules-load.d/%s.conf /etc/modprobe.d/%s.conf" % (files, basename, basename)
154 d.setVar('FILES_%s' % pkg, files) 154 d.setVar('FILES_%s' % pkg, files)
155 155
156 if vals.has_key("description"): 156 if "description" in vals:
157 old_desc = d.getVar('DESCRIPTION_' + pkg, True) or "" 157 old_desc = d.getVar('DESCRIPTION_' + pkg, True) or ""
158 d.setVar('DESCRIPTION_' + pkg, old_desc + "; " + vals["description"]) 158 d.setVar('DESCRIPTION_' + pkg, old_desc + "; " + vals["description"])
159 159
diff --git a/meta/lib/oe/prservice.py b/meta/lib/oe/prservice.py
index 27883a7e90..b0cbcb1fbc 100644
--- a/meta/lib/oe/prservice.py
+++ b/meta/lib/oe/prservice.py
@@ -101,7 +101,7 @@ def prserv_export_tofile(d, metainfo, datainfo, lockdown, nomax=False):
101 for i in range(len(datainfo)): 101 for i in range(len(datainfo)):
102 pkgarch = datainfo[i]['pkgarch'] 102 pkgarch = datainfo[i]['pkgarch']
103 value = datainfo[i]['value'] 103 value = datainfo[i]['value']
104 if not idx.has_key(pkgarch): 104 if pkgarch not in idx:
105 idx[pkgarch] = i 105 idx[pkgarch] = i
106 elif value > datainfo[idx[pkgarch]]['value']: 106 elif value > datainfo[idx[pkgarch]]['value']:
107 idx[pkgarch] = i 107 idx[pkgarch] = i
diff --git a/meta/lib/oe/qa.py b/meta/lib/oe/qa.py
index c4376f0161..d5cdaa0fcd 100644
--- a/meta/lib/oe/qa.py
+++ b/meta/lib/oe/qa.py
@@ -93,7 +93,7 @@ class ELFFile:
93 import bb.process 93 import bb.process
94 import sys 94 import sys
95 95
96 if self.objdump_output.has_key(cmd): 96 if cmd in self.objdump_output:
97 return self.objdump_output[cmd] 97 return self.objdump_output[cmd]
98 98
99 objdump = d.getVar('OBJDUMP', True) 99 objdump = d.getVar('OBJDUMP', True)
diff --git a/meta/recipes-core/eglibc/eglibc-ld.inc b/meta/recipes-core/eglibc/eglibc-ld.inc
index e596b5591f..b1701f008b 100644
--- a/meta/recipes-core/eglibc/eglibc-ld.inc
+++ b/meta/recipes-core/eglibc/eglibc-ld.inc
@@ -1,7 +1,7 @@
1def ld_append_if_tune_exists(d, infos, dict): 1def ld_append_if_tune_exists(d, infos, dict):
2 tune = d.getVar("DEFAULTTUNE", True) or "" 2 tune = d.getVar("DEFAULTTUNE", True) or ""
3 libdir = d.getVar("base_libdir", True) or "" 3 libdir = d.getVar("base_libdir", True) or ""
4 if dict.has_key(tune): 4 if tune in dict:
5 infos['ldconfig'].add('{"' + libdir + '/' + dict[tune][0] + '",' + dict[tune][1] + ' }') 5 infos['ldconfig'].add('{"' + libdir + '/' + dict[tune][0] + '",' + dict[tune][1] + ' }')
6 infos['lddrewrite'].add(libdir+'/'+dict[tune][0]) 6 infos['lddrewrite'].add(libdir+'/'+dict[tune][0])
7 7