summaryrefslogtreecommitdiffstats
path: root/meta
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:54:37 +0000
commitcf3c96a425fcab7da9fa50bda097ac60c50f8b54 (patch)
tree68d18772fbe6d7f1ce3f0d58acfd3c9c40ebd7a4 /meta
parent9299df1ebc983078e9fac4e3fa619db6dabad4d0 (diff)
downloadpoky-cf3c96a425fcab7da9fa50bda097ac60c50f8b54.tar.gz
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]. (From OE-Core rev: f8f6992fe0f29db1cc4df15b7449e06188052041) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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 "
309 309
310python populate_packages_prepend () { 310python populate_packages_prepend () {
311 libdir = d.expand('${libdir}/perl/${PV}') 311 libdir = d.expand('${libdir}/perl/${PV}')
312 do_split_packages(d, libdir, 'auto/(.*)/[^/]*\.(so|ld|ix|al)', 'perl-module-%s', 'perl module %s', recursive=True, match_path=True, prepend=False) 312 do_split_packages(d, libdir, 'auto/([^.]*)/[^/]*\.(so|ld|ix|al)', 'perl-module-%s', 'perl module %s', recursive=True, match_path=True, prepend=False)
313 do_split_packages(d, libdir, 'Module/([^\/]*)\.pm', 'perl-module-%s', 'perl module %s', recursive=True, allow_dirs=False, match_path=True, prepend=False) 313 do_split_packages(d, libdir, 'Module/([^\/]*)\.pm', 'perl-module-%s', 'perl module %s', recursive=True, allow_dirs=False, match_path=True, prepend=False)
314 do_split_packages(d, libdir, 'Module/([^\/]*)/.*', 'perl-module-%s', 'perl module %s', recursive=True, allow_dirs=False, match_path=True, prepend=False) 314 do_split_packages(d, libdir, 'Module/([^\/]*)/.*', 'perl-module-%s', 'perl module %s', recursive=True, allow_dirs=False, match_path=True, prepend=False)
315 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) 315 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)