From f8f6992fe0f29db1cc4df15b7449e06188052041 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Thu, 21 Mar 2013 15:43:40 +0000 Subject: 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 Signed-off-by: Richard Purdie --- meta/recipes-devtools/perl/perl_5.14.3.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta/recipes-devtools/perl') 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) -- cgit 1.2.3-korg