diff options
author | Hongxu Jia <hongxu.jia@windriver.com> | 2013-03-11 14:34:09 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-04-23 13:00:51 +0100 |
commit | a477bc9088edb00f7b5635397fba9de3c2a85562 (patch) | |
tree | c325b8e5f364148278f341ffb20c95f90283b716 | |
parent | 5bd34b96617c3882856d40b7fe39c43bd4e2f939 (diff) | |
download | poky-a477bc9088edb00f7b5635397fba9de3c2a85562.tar.gz |
perl_5.14.2.bb: fix dependecies
This patch fixes 2 problems.
The first one is that when run "perl -V" on target, it fails with lack
of some .pm files. So add these perl module files to package perl itself
to fix this failure.
The second problem is that package nativesdk-perl-modules doesn't depends
on the single perl modules.
In the .bb file, dependencies of perl-modules are set by:
RRECOMMENDS_perl-modules = "${@d.getVar('PACKAGES', True)...}"
The PACKAGES would be reset by do_split_packages since:
PACKAGES_DYNAMIC = "perl-module-*"
PACKAGES_DYNAMIC_virtclass-nativesdk = "nativesdk-perl-module-*"
Then:
1) The target perl-modules RRECOMMENDS on perl-module-*, this is what
we expect.
2) But the nativesdk-perl-modules doesn't RRECOMMENDS on
nativesdk-perl-module-*, this is not what we expect.
The value of PACKAGES after do_split_packages has been set correctly (it
contains the nativesdk-perl-module-* packages)
But the:RRECOMMENDS_perl-modules = "${@d.getVar('PACKAGES', True)...}"
doesn't work correctly for nativesdk, the
d.getVar('RRECOMMENDS_perl-modules', True)
doesn't get the new value of the PACKAGES, it gets the value of PACKAGES
before the do_split_packages.
Cherry-pick commit 51cbb5ae76a22d465e2f6c5ef923ec2682624e3b
(From OE-Core rev: 4c2e03d9c078c72eb82cf9b9604cb7256387ccbe)
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-devtools/perl/perl_5.14.2.bb | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/meta/recipes-devtools/perl/perl_5.14.2.bb b/meta/recipes-devtools/perl/perl_5.14.2.bb index d3f6ffdb17..860080c900 100644 --- a/meta/recipes-devtools/perl/perl_5.14.2.bb +++ b/meta/recipes-devtools/perl/perl_5.14.2.bb | |||
@@ -244,7 +244,13 @@ perl_package_preprocess () { | |||
244 | 244 | ||
245 | PACKAGES = "perl-dbg perl perl-misc perl-dev perl-pod perl-doc perl-lib \ | 245 | PACKAGES = "perl-dbg perl perl-misc perl-dev perl-pod perl-doc perl-lib \ |
246 | perl-module-cpan perl-module-cpanplus perl-module-unicore" | 246 | perl-module-cpan perl-module-cpanplus perl-module-unicore" |
247 | FILES_${PN} = "${bindir}/perl ${bindir}/perl${PV}" | 247 | FILES_${PN} = "${bindir}/perl ${bindir}/perl${PV} \ |
248 | ${libdir}/perl/${PV}/Config.pm \ | ||
249 | ${libdir}/perl/${PV}/strict.pm \ | ||
250 | ${libdir}/perl/${PV}/warnings.pm \ | ||
251 | ${libdir}/perl/${PV}/warnings \ | ||
252 | ${libdir}/perl/${PV}/vars.pm \ | ||
253 | " | ||
248 | FILES_${PN}-dev = "${libdir}/perl/${PV}/CORE" | 254 | FILES_${PN}-dev = "${libdir}/perl/${PV}/CORE" |
249 | FILES_${PN}-lib = "${libdir}/libperl.so* \ | 255 | FILES_${PN}-lib = "${libdir}/libperl.so* \ |
250 | ${libdir}/perl5 \ | 256 | ${libdir}/perl5 \ |
@@ -295,7 +301,6 @@ FILES_perl-module-unicore += "${libdir}/perl/${PV}/unicore" | |||
295 | # packages (actually the non modules packages and not created too) | 301 | # packages (actually the non modules packages and not created too) |
296 | ALLOW_EMPTY_perl-modules = "1" | 302 | ALLOW_EMPTY_perl-modules = "1" |
297 | PACKAGES_append = " perl-modules " | 303 | PACKAGES_append = " perl-modules " |
298 | RRECOMMENDS_perl-modules = "${@d.getVar('PACKAGES', True).replace('${PN}-modules ', '').replace('${PN}-dbg ', '').replace('${PN}-misc ', '').replace('${PN}-dev ', '').replace('${PN}-pod ', '').replace('${PN}-doc ', '')}" | ||
299 | 304 | ||
300 | python populate_packages_prepend () { | 305 | python populate_packages_prepend () { |
301 | libdir = d.expand('${libdir}/perl/${PV}') | 306 | libdir = d.expand('${libdir}/perl/${PV}') |
@@ -303,6 +308,7 @@ python populate_packages_prepend () { | |||
303 | do_split_packages(d, libdir, 'auto/([^/]*)/.*', 'perl-module-%s', 'perl module %s', recursive=True, allow_dirs=False, match_path=True, prepend=False) | 308 | do_split_packages(d, libdir, 'auto/([^/]*)/.*', 'perl-module-%s', 'perl module %s', recursive=True, allow_dirs=False, match_path=True, prepend=False) |
304 | do_split_packages(d, libdir, 'Module/([^\/]*).*', 'perl-module-%s', 'perl module %s', recursive=True, allow_dirs=False, match_path=True, prepend=False) | 309 | do_split_packages(d, libdir, 'Module/([^\/]*).*', 'perl-module-%s', 'perl module %s', recursive=True, allow_dirs=False, match_path=True, prepend=False) |
305 | 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) | 310 | 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) |
311 | 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 ', '')) | ||
306 | } | 312 | } |
307 | 313 | ||
308 | PACKAGES_DYNAMIC = "perl-module-*" | 314 | PACKAGES_DYNAMIC = "perl-module-*" |