summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2014-05-22 15:28:32 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-05-27 16:11:54 +0100
commit2f4f644e3983c57c4d910cd93a7725186cbf8dcf (patch)
tree7946db3b6b77767dd39bf616c7067f37cfefffc1 /meta
parentaba63bab07e26b748811fdc178a896b314d51cb1 (diff)
downloadpoky-2f4f644e3983c57c4d910cd93a7725186cbf8dcf.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 ] (From OE-Core rev: 94e164c5b5316e2797c5bab51d127935002c6008) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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 () {
321 do_split_packages(d, libdir, 'Module/([^\/]*)\.pm', 'perl-module-%s', 'perl module %s', recursive=True, allow_dirs=False, match_path=True, prepend=False) 321 do_split_packages(d, libdir, 'Module/([^\/]*)\.pm', 'perl-module-%s', 'perl module %s', recursive=True, allow_dirs=False, match_path=True, prepend=False)
322 do_split_packages(d, libdir, 'Module/([^\/]*)/.*', 'perl-module-%s', 'perl module %s', recursive=True, allow_dirs=False, match_path=True, prepend=False) 322 do_split_packages(d, libdir, 'Module/([^\/]*)/.*', 'perl-module-%s', 'perl module %s', recursive=True, allow_dirs=False, match_path=True, prepend=False)
323 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) 323 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)
324 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 ', '')) 324
325 # perl-modules should recommend every perl module, and only the
326 # modules. Don't attempt to use the result of do_split_packages() as some
327 # modules are manually split (eg. perl-module-unicore).
328 packages = filter(lambda p: 'perl-module-' in p, d.getVar('PACKAGES', True).split())
329 d.setVar("RRECOMMENDS_${PN}-modules", ' '.join(packages))
325} 330}
326 331
327PACKAGES_DYNAMIC += "^perl-module-.*" 332PACKAGES_DYNAMIC += "^perl-module-.*"