From e8e03deb1eb8fbbf297ad4b07f7e1642102ae308 Mon Sep 17 00:00:00 2001 From: Kang Kai Date: Mon, 5 Nov 2012 11:27:11 +0800 Subject: perl: update RPROVIDES and popuate_package script File warnings/register.pm has been moved to package perl, update RPROVIDES_perl to provides perl-module-warnings-register for backward compatibility. Update populate_package script for: 1 Way to deal directory 'Module/' is not right, it creates packages whose names end with '-pm'. Update to drop these packages. 2 Deal directory 'auto/' to put same name module file(.pm) and library file(.so) into one package. That because .pm file requires the same name .so file at runtime. [Part of Yocto 3338] Signed-off-by: Kang Kai Signed-off-by: Saul Wold --- meta/recipes-devtools/perl/perl_5.14.2.bb | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'meta/recipes-devtools/perl') diff --git a/meta/recipes-devtools/perl/perl_5.14.2.bb b/meta/recipes-devtools/perl/perl_5.14.2.bb index 8cff7f58cf..8678e76dec 100644 --- a/meta/recipes-devtools/perl/perl_5.14.2.bb +++ b/meta/recipes-devtools/perl/perl_5.14.2.bb @@ -250,7 +250,8 @@ FILES_${PN} = "${bindir}/perl ${bindir}/perl${PV} \ ${libdir}/perl/${PV}/warnings \ ${libdir}/perl/${PV}/vars.pm \ " -RPROVIDES_${PN} += "perl-module-strict perl-module-vars perl-module-config perl-module-warnings" +RPROVIDES_${PN} += "perl-module-strict perl-module-vars perl-module-config perl-module-warnings \ + perl-module-warnings-register" FILES_${PN}-dev = "${libdir}/perl/${PV}/CORE" FILES_${PN}-lib = "${libdir}/libperl.so* \ ${libdir}/perl5 \ @@ -304,9 +305,9 @@ PACKAGES_append = " perl-modules " python populate_packages_prepend () { libdir = d.expand('${libdir}/perl/${PV}') - do_split_packages(d, libdir, 'auto/(Encode/.[^/]*)/.*', 'perl-module-%s', 'perl module %s', recursive=True, allow_dirs=False, match_path=True, prepend=False) - do_split_packages(d, libdir, 'auto/([^/]*)/.*', '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, '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) d.setVar("RRECOMMENDS_${PN}-modules", d.getVar('PACKAGES', True).replace('${PN}-modules ', '').replace('${PN}-dbg ', '').replace('${PN}-misc ', '').replace('${PN}-dev ', '').replace('${PN}-pod ', '').replace('${PN}-doc ', '')) } -- cgit 1.2.3-korg