summaryrefslogtreecommitdiffstats
path: root/meta
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
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')
-rw-r--r--meta/classes/insane.bbclass26
-rw-r--r--meta/classes/multilib_global.bbclass2
-rw-r--r--meta/lib/oe/qa.py2
-rw-r--r--meta/lib/oe/sstatesig.py20
-rw-r--r--meta/recipes-core/meta/external-sourcery-toolchain.bb2
-rw-r--r--meta/recipes-devtools/cmake/cmake_2.8.10.2.bb4
-rw-r--r--meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc4
-rw-r--r--meta/recipes-kernel/linux/linux-dtb.inc8
8 files changed, 34 insertions, 34 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
diff --git a/meta/lib/oe/qa.py b/meta/lib/oe/qa.py
index 4777ddc06a..c4376f0161 100644
--- a/meta/lib/oe/qa.py
+++ b/meta/lib/oe/qa.py
@@ -72,7 +72,7 @@ class ELFFile:
72 return ord(self.data[ELFFile.EI_ABIVERSION]) 72 return ord(self.data[ELFFile.EI_ABIVERSION])
73 73
74 def abiSize(self): 74 def abiSize(self):
75 return self.bits 75 return self.bits
76 76
77 def isLittleEndian(self): 77 def isLittleEndian(self):
78 return self.sex == "<" 78 return self.sex == "<"
diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py
index 79a410eecb..852fb7e64a 100644
--- a/meta/lib/oe/sstatesig.py
+++ b/meta/lib/oe/sstatesig.py
@@ -108,16 +108,16 @@ def find_siginfo(pn, taskname, taskhashlist, d):
108 foundall = False 108 foundall = False
109 import glob 109 import glob
110 for fullpath in glob.glob(filespec): 110 for fullpath in glob.glob(filespec):
111 match = False 111 match = False
112 if taskhashlist: 112 if taskhashlist:
113 for taskhash in taskhashlist: 113 for taskhash in taskhashlist:
114 if fullpath.endswith('.%s' % taskhash): 114 if fullpath.endswith('.%s' % taskhash):
115 hashfiles[taskhash] = fullpath 115 hashfiles[taskhash] = fullpath
116 if len(hashfiles) == len(taskhashlist): 116 if len(hashfiles) == len(taskhashlist):
117 foundall = True 117 foundall = True
118 break 118 break
119 else: 119 else:
120 filedates[fullpath] = os.stat(fullpath).st_mtime 120 filedates[fullpath] = os.stat(fullpath).st_mtime
121 121
122 if len(filedates) < 2 and not foundall: 122 if len(filedates) < 2 and not foundall:
123 # That didn't work, look in sstate-cache 123 # That didn't work, look in sstate-cache
diff --git a/meta/recipes-core/meta/external-sourcery-toolchain.bb b/meta/recipes-core/meta/external-sourcery-toolchain.bb
index 24c7ce8564..5fed30a6b2 100644
--- a/meta/recipes-core/meta/external-sourcery-toolchain.bb
+++ b/meta/recipes-core/meta/external-sourcery-toolchain.bb
@@ -142,6 +142,6 @@ CSL_VER_MAIN ??= ""
142 142
143python () { 143python () {
144 if not d.getVar("CSL_VER_MAIN"): 144 if not d.getVar("CSL_VER_MAIN"):
145 raise bb.parse.SkipPackage("External CSL toolchain not configured (CSL_VER_MAIN not set).") 145 raise bb.parse.SkipPackage("External CSL toolchain not configured (CSL_VER_MAIN not set).")
146} 146}
147 147
diff --git a/meta/recipes-devtools/cmake/cmake_2.8.10.2.bb b/meta/recipes-devtools/cmake/cmake_2.8.10.2.bb
index ce398ddc1b..65f75b4dca 100644
--- a/meta/recipes-devtools/cmake/cmake_2.8.10.2.bb
+++ b/meta/recipes-devtools/cmake/cmake_2.8.10.2.bb
@@ -17,11 +17,11 @@ python () {
17 docdir=d.getVar("docdir", True) 17 docdir=d.getVar("docdir", True)
18 18
19 if not docdir.startswith(prefix): 19 if not docdir.startswith(prefix):
20 raise bb.build.FuncFailed('docdir must contain prefix as its prefix') 20 raise bb.build.FuncFailed('docdir must contain prefix as its prefix')
21 21
22 docdir_stripped = docdir[len(prefix):] 22 docdir_stripped = docdir[len(prefix):]
23 if len(docdir_stripped) > 0 and docdir_stripped[0] == '/': 23 if len(docdir_stripped) > 0 and docdir_stripped[0] == '/':
24 docdir_stripped = docdir_stripped[1:] 24 docdir_stripped = docdir_stripped[1:]
25 25
26 d.setVar("docdir_stripped", docdir_stripped) 26 d.setVar("docdir_stripped", docdir_stripped)
27} 27}
diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc
index 962ca757cd..96fe2ffd62 100644
--- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc
+++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc
@@ -7,9 +7,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
7python __anonymous () { 7python __anonymous () {
8 major = d.getVar("PV",True).split('.')[0] 8 major = d.getVar("PV",True).split('.')[0]
9 if major == "3": 9 if major == "3":
10 d.setVar("HEADER_FETCH_VER", "3.0") 10 d.setVar("HEADER_FETCH_VER", "3.0")
11 else: 11 else:
12 d.setVar("HEADER_FETCH_VER", "2.6") 12 d.setVar("HEADER_FETCH_VER", "2.6")
13} 13}
14 14
15inherit kernel-arch 15inherit kernel-arch
diff --git a/meta/recipes-kernel/linux/linux-dtb.inc b/meta/recipes-kernel/linux/linux-dtb.inc
index 58b93a1255..7747718391 100644
--- a/meta/recipes-kernel/linux/linux-dtb.inc
+++ b/meta/recipes-kernel/linux/linux-dtb.inc
@@ -5,10 +5,10 @@ KERNEL_DEVICETREE_FLAGS ?= "-R 8 -p 0x3000"
5python __anonymous () { 5python __anonymous () {
6 devicetree = d.getVar("KERNEL_DEVICETREE", True) or '' 6 devicetree = d.getVar("KERNEL_DEVICETREE", True) or ''
7 if devicetree: 7 if devicetree:
8 depends = d.getVar("DEPENDS", True) 8 depends = d.getVar("DEPENDS", True)
9 d.setVar("DEPENDS", "%s dtc-native" % depends) 9 d.setVar("DEPENDS", "%s dtc-native" % depends)
10 packages = d.getVar("PACKAGES", True) 10 packages = d.getVar("PACKAGES", True)
11 d.setVar("PACKAGES", "%s kernel-devicetree" % packages) 11 d.setVar("PACKAGES", "%s kernel-devicetree" % packages)
12} 12}
13 13
14do_install_append() { 14do_install_append() {