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:38:12 +0000 |
commit | 47df8c0dd8ff86af97e6c6d217fb8d69ebec24e5 (patch) | |
tree | cddb7df53dde0043b9efa2423ec513fb6662b3f5 /meta/recipes-devtools/perl | |
parent | f0f766160663407ea7683d31bbf5f011accc9ba2 (diff) | |
download | openembedded-core-47df8c0dd8ff86af97e6c6d217fb8d69ebec24e5.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
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 S = "${WORKDIR}/perl-${PV}" -inherit upstream-version-is-even +inherit upstream-version-is-even update-alternatives DEPENDS += "zlib virtual/crypt" @@ -240,6 +240,10 @@ FILES_${PN}-module-cpan += "${libdir}/perl5/${PV}/CPAN \ " FILES_${PN}-module-unicore += "${libdir}/perl5/${PV}/unicore" +ALTERNATIVE_PRIORITY = "40" +ALTERNATIVE_${PN}-doc = "Thread.3" +ALTERNATIVE_LINK_NAME[Thread.3] = "${mandir}/man3/Thread.3" + # Create a perl-modules package recommending all the other perl # packages (actually the non modules packages and not created too) ALLOW_EMPTY_${PN}-modules = "1" |