From d887bac4a28f2bef04ca8275eee9b09d9f80f056 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 21 Sep 2011 12:38:31 +0100 Subject: 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 --- meta/classes/debian.bbclass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'meta/classes/debian.bbclass') 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 () { 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 -- cgit v1.2.3-54-g00ecf