diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-09-21 12:38:31 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-09-21 13:39:22 +0100 |
| commit | 6b2e41023941f15d0f9211ef17339ba1fca9a3b9 (patch) | |
| tree | 357604927b058af02c0cf9b299bde55360b58ee8 /meta/classes/debian.bbclass | |
| parent | 30064a98dc9049db4a37f119d15fbb59aa3c8377 (diff) | |
| download | openembedded-core-6b2e41023941f15d0f9211ef17339ba1fca9a3b9.tar.gz openembedded-core-6b2e41023941f15d0f9211ef17339ba1fca9a3b9.tar.bz2 openembedded-core-6b2e41023941f15d0f9211ef17339ba1fca9a3b9.tar.xz openembedded-core-6b2e41023941f15d0f9211ef17339ba1fca9a3b9.zip | |
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.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/debian.bbclass')
| -rw-r--r-- | meta/classes/debian.bbclass | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/classes/debian.bbclass b/meta/classes/debian.bbclass index 188083077..554525dc8 100644 --- a/meta/classes/debian.bbclass +++ b/meta/classes/debian.bbclass @@ -24,6 +24,9 @@ python debian_package_name_hook () { pkgdest = bb.data.getVar('PKGDEST', d, 1) packages = bb.data.getVar('PACKAGES', d, 1) + bin_re = re.compile(".*/s?" + os.path.basename(d.getVar("bindir", True)) + "$") + lib_re = re.compile(".*/" + os.path.basename(d.getVar("libdir", True)) + "$") + so_re = re.compile("lib.*\.so") def socrunch(s): s = s.lower().replace('_', '-') @@ -45,9 +48,6 @@ python debian_package_name_hook () { return (s[stat.ST_MODE] & stat.S_IEXEC) def auto_libname(packages, orig_pkg): - bin_re = re.compile(".*/s?bin$") - lib_re = re.compile(".*/lib$") - so_re = re.compile("lib.*\.so") sonames = [] has_bins = 0 has_libs = 0 |