diff options
| author | Kang Kai <kai.kang@windriver.com> | 2012-11-05 11:27:11 +0800 |
|---|---|---|
| committer | Saul Wold <sgw@linux.intel.com> | 2013-01-04 22:01:20 -0800 |
| commit | e8e03deb1eb8fbbf297ad4b07f7e1642102ae308 (patch) | |
| tree | 71160742da0ef9b388bd83c765ac54acba4941dd /meta/recipes-devtools | |
| parent | 96fb96ddd00881947875518df832fa74faec8a45 (diff) | |
| download | openembedded-core-e8e03deb1eb8fbbf297ad4b07f7e1642102ae308.tar.gz openembedded-core-e8e03deb1eb8fbbf297ad4b07f7e1642102ae308.tar.bz2 openembedded-core-e8e03deb1eb8fbbf297ad4b07f7e1642102ae308.zip | |
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 <kai.kang@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-devtools')
| -rw-r--r-- | meta/recipes-devtools/perl/perl_5.14.2.bb | 9 |
1 files changed, 5 insertions, 4 deletions
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 ', '')) } |