summaryrefslogtreecommitdiff
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:04:18 +0100
commitfafeb381c48291fa65c634c01c244843c8d7fad3 (patch)
tree41a94affedce2db29d42b4151dc7d40f0ded8223 /meta/classes
parentf4b382754603d3f1caa13824bcc8d06b568bbc59 (diff)
downloadopenembedded-core-fafeb381c48291fa65c634c01c244843c8d7fad3.tar.gz
openembedded-core-fafeb381c48291fa65c634c01c244843c8d7fad3.tar.bz2
openembedded-core-fafeb381c48291fa65c634c01c244843c8d7fad3.zip
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. 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):
import re
rpath_re = re.compile("\s+RPATH\s+(.*)")
for line in phdrs.split("\n"):
- m = rpath_re.match(line)
- if m:
- rpath = m.group(1)
- for dir in bad_dirs:
+ m = rpath_re.match(line)
+ if m:
+ rpath = m.group(1)
+ for dir in bad_dirs:
if dir in rpath:
messages.append("package %s contains bad RPATH %s in file %s" % (name, rpath, file))
@@ -202,13 +202,13 @@ def package_qa_check_useless_rpaths(file, name, d, elf, messages):
import re
rpath_re = re.compile("\s+RPATH\s+(.*)")
for line in phdrs.split("\n"):
- m = rpath_re.match(line)
- if m:
- rpath = m.group(1)
- if rpath_eq(rpath, libdir) or rpath_eq(rpath, base_libdir):
- # The dynamic linker searches both these places anyway. There is no point in
- # looking there again.
- messages.append("%s: %s contains probably-redundant RPATH %s" % (name, package_qa_clean_path(file, d), rpath))
+ m = rpath_re.match(line)
+ if m:
+ rpath = m.group(1)
+ if rpath_eq(rpath, libdir) or rpath_eq(rpath, base_libdir):
+ # The dynamic linker searches both these places anyway. There is no point in
+ # looking there again.
+ messages.append("%s: %s contains probably-redundant RPATH %s" % (name, package_qa_clean_path(file, d), rpath))
QAPATHTEST[dev-so] = "package_qa_check_dev"
def package_qa_check_dev(path, name, d, elf, messages):
@@ -463,7 +463,7 @@ def package_qa_textrel(path, name, d, elf, messages):
textrel_re = re.compile("\s+TEXTREL\s+")
for line in phdrs.split("\n"):
if textrel_re.match(line):
- sane = False
+ sane = False
if not sane:
messages.append("ELF binary '%s' has relocations in .text" % path)
@@ -498,7 +498,7 @@ def package_qa_hash_style(path, name, d, elf, messages):
if "GNU_HASH" in line:
sane = True
if "[mips32]" in line or "[mips64]" in line:
- sane = True
+ sane = True
if has_syms and not sane:
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 () {
if isinstance(e, bb.event.RecipePreFinalise):
for v in e.data.getVar("MULTILIB_VARIANTS", True).split():
if e.data.getVar("TARGET_VENDOR_virtclass-multilib-" + v, False) is None:
- e.data.setVar("TARGET_VENDOR_virtclass-multilib-" + v, e.data.getVar("TARGET_VENDOR", False) + "ml" + v)
+ e.data.setVar("TARGET_VENDOR_virtclass-multilib-" + v, e.data.getVar("TARGET_VENDOR", False) + "ml" + v)
variant = e.data.getVar("BBEXTENDVARIANT", True)