summaryrefslogtreecommitdiff
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2013-03-21 15:43:40 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-03-22 16:25:44 +0000
commitf8f6992fe0f29db1cc4df15b7449e06188052041 (patch)
tree26e5c482402994a8e7bb5ac292a199597e7b3856 /meta/recipes-devtools
parentda682e752e351e5bb7636ee187db3eabc208c177 (diff)
downloadopenembedded-core-f8f6992fe0f29db1cc4df15b7449e06188052041.tar.gz
openembedded-core-f8f6992fe0f29db1cc4df15b7449e06188052041.tar.bz2
openembedded-core-f8f6992fe0f29db1cc4df15b7449e06188052041.zip
perl: avoid splitting out .debug directories as packages
The recursive parameter is set to True, the regex for the first call to do_split_packages matches any path under ${libdir}/perl/${PV}/auto/, and the .debug directories contain .so files, so each one was getting picked up as a package. Change the regex to disallow dots in the path beneath auto/ and thus avoid the .debug directories. Fixes [YOCTO #4048]. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/perl/perl_5.14.3.bb2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-devtools/perl/perl_5.14.3.bb b/meta/recipes-devtools/perl/perl_5.14.3.bb
index 1c3566b484..72efc638b2 100644
--- a/meta/recipes-devtools/perl/perl_5.14.3.bb
+++ b/meta/recipes-devtools/perl/perl_5.14.3.bb
@@ -309,7 +309,7 @@ PACKAGES_append = " perl-modules "
python populate_packages_prepend () {
libdir = d.expand('${libdir}/perl/${PV}')
- do_split_packages(d, libdir, 'auto/(.*)/[^/]*\.(so|ld|ix|al)', 'perl-module-%s', 'perl module %s', recursive=True, match_path=True, prepend=False)
+ do_split_packages(d, libdir, 'auto/([^.]*)/[^/]*\.(so|ld|ix|al)', 'perl-module-%s', 'perl module %s', recursive=True, match_path=True, prepend=False)
do_split_packages(d, libdir, 'Module/([^\/]*)\.pm', 'perl-module-%s', 'perl module %s', recursive=True, allow_dirs=False, match_path=True, prepend=False)
do_split_packages(d, libdir, 'Module/([^\/]*)/.*', 'perl-module-%s', 'perl module %s', recursive=True, allow_dirs=False, match_path=True, prepend=False)
do_split_packages(d, libdir, '(^(?!(CPAN\/|CPANPLUS\/|Module\/|unicore\/|auto\/)[^\/]).*)\.(pm|pl|e2x)', 'perl-module-%s', 'perl module %s', recursive=True, allow_dirs=False, match_path=True, prepend=False)