summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-09-21 12:38:31 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-09-21 13:42:53 +0100
commitd887bac4a28f2bef04ca8275eee9b09d9f80f056 (patch)
tree44a35638d54e27110da3230dc3b1b94f59f3cf08
parent737f8bbb4f27b4837047cb9b4fbfe01dfde36d54 (diff)
downloadpoky-d887bac4a28f2bef04ca8275eee9b09d9f80f056.tar.gz
debian.bbclass: Fix hardcoded "lib" reference
This patch removes a hardcoded "lib" reference from debian.bbclass allowing libdirs like "lib64" to be used. Whilst working on this area of code, a similar assumption about "bin" is removed and the regular expression compilation is moved to the parent function since it doesn't change and this will improve the speed of the code. (From OE-Core rev: 6b2e41023941f15d0f9211ef17339ba1fca9a3b9) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/debian.bbclass6
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/classes/debian.bbclass b/meta/classes/debian.bbclass
index 1880830775..554525dc84 100644
--- a/meta/classes/debian.bbclass
+++ b/meta/classes/debian.bbclass
@@ -24,6 +24,9 @@ python debian_package_name_hook () {
24 24
25 pkgdest = bb.data.getVar('PKGDEST', d, 1) 25 pkgdest = bb.data.getVar('PKGDEST', d, 1)
26 packages = bb.data.getVar('PACKAGES', d, 1) 26 packages = bb.data.getVar('PACKAGES', d, 1)
27 bin_re = re.compile(".*/s?" + os.path.basename(d.getVar("bindir", True)) + "$")
28 lib_re = re.compile(".*/" + os.path.basename(d.getVar("libdir", True)) + "$")
29 so_re = re.compile("lib.*\.so")
27 30
28 def socrunch(s): 31 def socrunch(s):
29 s = s.lower().replace('_', '-') 32 s = s.lower().replace('_', '-')
@@ -45,9 +48,6 @@ python debian_package_name_hook () {
45 return (s[stat.ST_MODE] & stat.S_IEXEC) 48 return (s[stat.ST_MODE] & stat.S_IEXEC)
46 49
47 def auto_libname(packages, orig_pkg): 50 def auto_libname(packages, orig_pkg):
48 bin_re = re.compile(".*/s?bin$")
49 lib_re = re.compile(".*/lib$")
50 so_re = re.compile("lib.*\.so")
51 sonames = [] 51 sonames = []
52 has_bins = 0 52 has_bins = 0
53 has_libs = 0 53 has_libs = 0