From 2f4f644e3983c57c4d910cd93a7725186cbf8dcf Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Thu, 22 May 2014 15:28:32 +0100 Subject: 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 ] (From OE-Core rev: 94e164c5b5316e2797c5bab51d127935002c6008) Signed-off-by: Ross Burton Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/recipes-devtools/perl/perl_5.14.3.bb | 7 ++++++- 1 file changed, 6 insertions(+), 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 fcd665b..6aaaade 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-.*" -- cgit v1.1