aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2014-05-22 15:28:32 +0100
committerSaul Wold <sgw@linux.intel.com>2014-05-23 10:45:07 -0700
commit94e164c5b5316e2797c5bab51d127935002c6008 (patch)
tree0c41c9821d85f8f2bcfae7504003020d73043107 /meta/recipes-devtools
parent862f14832d2d8a1917a5046d0299dbbbe6dc66da (diff)
downloadopenembedded-core-94e164c5b5316e2797c5bab51d127935002c6008.tar.gz
perl: stop perl-modules recommending perl-ptest
Change the logic that generates the perl-modules recommends to be an include filter instead of an exclude filter, so that new sub-packages don't become dependants of perl-modules (such as perl-ptest). [ YOCTO #6203 ] Signed-off-by: Ross Burton <ross.burton@intel.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.3.bb7
1 files changed, 6 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 fcd665bf34..6aaaade34f 100644
--- a/meta/recipes-devtools/perl/perl_5.14.3.bb
+++ b/meta/recipes-devtools/perl/perl_5.14.3.bb
@@ -321,7 +321,12 @@ python populate_packages_prepend () {
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 ', ''))
+
+ # perl-modules should recommend every perl module, and only the
+ # modules. Don't attempt to use the result of do_split_packages() as some
+ # modules are manually split (eg. perl-module-unicore).
+ packages = filter(lambda p: 'perl-module-' in p, d.getVar('PACKAGES', True).split())
+ d.setVar("RRECOMMENDS_${PN}-modules", ' '.join(packages))
}
PACKAGES_DYNAMIC += "^perl-module-.*"