diff options
author | Hongxu Jia <hongxu.jia@windriver.com> | 2019-12-21 14:19:35 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-12-30 23:39:10 +0000 |
commit | 4600ba62f1afd09ac10e138f11ac129d928810e5 (patch) | |
tree | 07194af6be1d39596e57882affdafeca247e23a6 /meta/recipes-devtools/perl | |
parent | 52e10a01b455a2a0439cb1abacf35c8c6fb55e09 (diff) | |
download | poky-4600ba62f1afd09ac10e138f11ac129d928810e5.tar.gz |
perl/tcl: fix /usr/share/man/man3/Thread.3 conflicts
While installing perl-doc and tcl-doc to image, there is a file conflicts
at do_rootfs
...
|file /usr/share/man/man3/Thread.3 conflicts between attempted installs of
perl-doc-5.30.1-r0.core2_64 and tcl-doc-8.6.10-r0.core2_64
...
Use update-alternatives to fix
(From OE-Core rev: 47df8c0dd8ff86af97e6c6d217fb8d69ebec24e5)
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/perl')
-rw-r--r-- | meta/recipes-devtools/perl/perl_5.30.1.bb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/meta/recipes-devtools/perl/perl_5.30.1.bb b/meta/recipes-devtools/perl/perl_5.30.1.bb index 9b1f1af072..6e0b2007fb 100644 --- a/meta/recipes-devtools/perl/perl_5.30.1.bb +++ b/meta/recipes-devtools/perl/perl_5.30.1.bb | |||
@@ -32,7 +32,7 @@ SRC_URI[perl-cross.sha256sum] = "edce0b0c2f725e2db3f203d6d8e9f3f7161256f5d159055 | |||
32 | 32 | ||
33 | S = "${WORKDIR}/perl-${PV}" | 33 | S = "${WORKDIR}/perl-${PV}" |
34 | 34 | ||
35 | inherit upstream-version-is-even | 35 | inherit upstream-version-is-even update-alternatives |
36 | 36 | ||
37 | DEPENDS += "zlib virtual/crypt" | 37 | DEPENDS += "zlib virtual/crypt" |
38 | 38 | ||
@@ -240,6 +240,10 @@ FILES_${PN}-module-cpan += "${libdir}/perl5/${PV}/CPAN \ | |||
240 | " | 240 | " |
241 | FILES_${PN}-module-unicore += "${libdir}/perl5/${PV}/unicore" | 241 | FILES_${PN}-module-unicore += "${libdir}/perl5/${PV}/unicore" |
242 | 242 | ||
243 | ALTERNATIVE_PRIORITY = "40" | ||
244 | ALTERNATIVE_${PN}-doc = "Thread.3" | ||
245 | ALTERNATIVE_LINK_NAME[Thread.3] = "${mandir}/man3/Thread.3" | ||
246 | |||
243 | # Create a perl-modules package recommending all the other perl | 247 | # Create a perl-modules package recommending all the other perl |
244 | # packages (actually the non modules packages and not created too) | 248 | # packages (actually the non modules packages and not created too) |
245 | ALLOW_EMPTY_${PN}-modules = "1" | 249 | ALLOW_EMPTY_${PN}-modules = "1" |