summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeffrey C Honig <jch@honig.net>2013-11-13 11:37:41 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-12-12 17:00:18 +0000
commit8072e0726c134411c2c556770bfbea6f398a9922 (patch)
treef035ab88e1fb5808f09ba6f553a6e339ad2bbd8d
parenta8008ea07b8d852a3b67fd2a4059669b56cb8e2a (diff)
downloadpoky-8072e0726c134411c2c556770bfbea6f398a9922.tar.gz
perl: perl-ptest.inc polutes package dependencies when ptest not enabled
When ptest is not enabled, the populate_packages_prepend function runs wheter ptest is enabled or not. This causes ptest packages to get in the dependencies list when ptest is not enabled. (From OE-Core master rev: 826f4e4057a221127ac4c1d0658d975032fc7d90) (From OE-Core rev: e739a64143901fa6f6f54e70445d19e9ce13dcf1) Signed-off-by: Jeffrey C Honig <jeffrey.honig@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/perl/perl-ptest.inc5
1 files changed, 3 insertions, 2 deletions
diff --git a/meta/recipes-devtools/perl/perl-ptest.inc b/meta/recipes-devtools/perl/perl-ptest.inc
index 15afe2dab4..6999e6be37 100644
--- a/meta/recipes-devtools/perl/perl-ptest.inc
+++ b/meta/recipes-devtools/perl/perl-ptest.inc
@@ -42,8 +42,9 @@ python populate_packages_prepend() {
42 # Put all *.t files from the lib dir in the ptest package 42 # Put all *.t files from the lib dir in the ptest package
43 # do_split_packages requires a pair of () in the regex, but we have nothing 43 # do_split_packages requires a pair of () in the regex, but we have nothing
44 # to match, so use an empty pair. 44 # to match, so use an empty pair.
45 do_split_packages(d, d.expand('${libdir}/perl/${PV}'), '.*\.t()', 45 if "ptest" in d.getVar("DISTRO_FEATURES", True).split():
46 '${PN}-ptest%s', '%s', recursive=True, match_path=True) 46 do_split_packages(d, d.expand('${libdir}/perl/${PV}'), '.*\.t()',
47 '${PN}-ptest%s', '%s', recursive=True, match_path=True)
47} 48}
48 49
49RDEPENDS_${PN}-ptest += "${PN}-modules ${PN}-doc ${PN}-misc" 50RDEPENDS_${PN}-ptest += "${PN}-modules ${PN}-doc ${PN}-misc"