summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2013-05-07 13:55:53 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-05-09 14:06:51 +0100
commitc3d18afaa54fe81aef80e45ec3564f7318dd4966 (patch)
tree84bb27fa41c7a29e2e3a6351792e4fd6df4fcd66 /meta/classes
parentdb8217f6b89be11a17e9f3cba7d98be64d8aded1 (diff)
downloadpoky-c3d18afaa54fe81aef80e45ec3564f7318dd4966.tar.gz
classes/recipes/lib: Fix various python whitespace issues
There are some left over tab characters in the python functions. This removes them and resolves python 3 errors. (From OE-Core rev: fafeb381c48291fa65c634c01c244843c8d7fad3) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/insane.bbclass26
-rw-r--r--meta/classes/multilib_global.bbclass2
2 files changed, 14 insertions, 14 deletions
diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass
index 336beaa061..41007f8e18 100644
--- a/meta/classes/insane.bbclass
+++ b/meta/classes/insane.bbclass
@@ -173,10 +173,10 @@ def package_qa_check_rpath(file,name, d, elf, messages):
173 import re 173 import re
174 rpath_re = re.compile("\s+RPATH\s+(.*)") 174 rpath_re = re.compile("\s+RPATH\s+(.*)")
175 for line in phdrs.split("\n"): 175 for line in phdrs.split("\n"):
176 m = rpath_re.match(line) 176 m = rpath_re.match(line)
177 if m: 177 if m:
178 rpath = m.group(1) 178 rpath = m.group(1)
179 for dir in bad_dirs: 179 for dir in bad_dirs:
180 if dir in rpath: 180 if dir in rpath:
181 messages.append("package %s contains bad RPATH %s in file %s" % (name, rpath, file)) 181 messages.append("package %s contains bad RPATH %s in file %s" % (name, rpath, file))
182 182
@@ -202,13 +202,13 @@ def package_qa_check_useless_rpaths(file, name, d, elf, messages):
202 import re 202 import re
203 rpath_re = re.compile("\s+RPATH\s+(.*)") 203 rpath_re = re.compile("\s+RPATH\s+(.*)")
204 for line in phdrs.split("\n"): 204 for line in phdrs.split("\n"):
205 m = rpath_re.match(line) 205 m = rpath_re.match(line)
206 if m: 206 if m:
207 rpath = m.group(1) 207 rpath = m.group(1)
208 if rpath_eq(rpath, libdir) or rpath_eq(rpath, base_libdir): 208 if rpath_eq(rpath, libdir) or rpath_eq(rpath, base_libdir):
209 # The dynamic linker searches both these places anyway. There is no point in 209 # The dynamic linker searches both these places anyway. There is no point in
210 # looking there again. 210 # looking there again.
211 messages.append("%s: %s contains probably-redundant RPATH %s" % (name, package_qa_clean_path(file, d), rpath)) 211 messages.append("%s: %s contains probably-redundant RPATH %s" % (name, package_qa_clean_path(file, d), rpath))
212 212
213QAPATHTEST[dev-so] = "package_qa_check_dev" 213QAPATHTEST[dev-so] = "package_qa_check_dev"
214def package_qa_check_dev(path, name, d, elf, messages): 214def package_qa_check_dev(path, name, d, elf, messages):
@@ -463,7 +463,7 @@ def package_qa_textrel(path, name, d, elf, messages):
463 textrel_re = re.compile("\s+TEXTREL\s+") 463 textrel_re = re.compile("\s+TEXTREL\s+")
464 for line in phdrs.split("\n"): 464 for line in phdrs.split("\n"):
465 if textrel_re.match(line): 465 if textrel_re.match(line):
466 sane = False 466 sane = False
467 467
468 if not sane: 468 if not sane:
469 messages.append("ELF binary '%s' has relocations in .text" % path) 469 messages.append("ELF binary '%s' has relocations in .text" % path)
@@ -498,7 +498,7 @@ def package_qa_hash_style(path, name, d, elf, messages):
498 if "GNU_HASH" in line: 498 if "GNU_HASH" in line:
499 sane = True 499 sane = True
500 if "[mips32]" in line or "[mips64]" in line: 500 if "[mips32]" in line or "[mips64]" in line:
501 sane = True 501 sane = True
502 502
503 if has_syms and not sane: 503 if has_syms and not sane:
504 messages.append("No GNU_HASH in the elf binary: '%s'" % path) 504 messages.append("No GNU_HASH in the elf binary: '%s'" % path)
diff --git a/meta/classes/multilib_global.bbclass b/meta/classes/multilib_global.bbclass
index 529e82a8bd..85f2d8d15d 100644
--- a/meta/classes/multilib_global.bbclass
+++ b/meta/classes/multilib_global.bbclass
@@ -5,7 +5,7 @@ python multilib_virtclass_handler_global () {
5 if isinstance(e, bb.event.RecipePreFinalise): 5 if isinstance(e, bb.event.RecipePreFinalise):
6 for v in e.data.getVar("MULTILIB_VARIANTS", True).split(): 6 for v in e.data.getVar("MULTILIB_VARIANTS", True).split():
7 if e.data.getVar("TARGET_VENDOR_virtclass-multilib-" + v, False) is None: 7 if e.data.getVar("TARGET_VENDOR_virtclass-multilib-" + v, False) is None:
8 e.data.setVar("TARGET_VENDOR_virtclass-multilib-" + v, e.data.getVar("TARGET_VENDOR", False) + "ml" + v) 8 e.data.setVar("TARGET_VENDOR_virtclass-multilib-" + v, e.data.getVar("TARGET_VENDOR", False) + "ml" + v)
9 9
10 variant = e.data.getVar("BBEXTENDVARIANT", True) 10 variant = e.data.getVar("BBEXTENDVARIANT", True)
11 11