mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-27 03:32:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

perl/tcl: fix /usr/share/man/man3/Thread.3 conflicts

Browse Source 
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>
This commit is contained in:
Hongxu Jia
2019-12-21 14:19:35 +08:00
committed by Richard Purdie
parent 52e10a01b4
commit 4600ba62f1
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
meta/recipes-devtools/perl/perl_5.30.1.bb
View File

@@ -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"

5
meta/recipes-devtools/tcltk/tcl_8.6.10.bb
View File

@@ -34,7 +34,7 @@ S = "${WORKDIR}/${BPN}${PV}/unix"
VER = "${PV}"
inherit autotools ptest binconfig
inherit autotools ptest binconfig update-alternatives
EXTRA_OECONF = "--enable-threads --disable-rpath --libdir=${libdir}"
@@ -65,6 +65,9 @@ FILES_tcl-lib = "${libdir}/libtcl8.6.so.*"
FILES_${PN} += "${libdir}/tcl${VER} ${libdir}/tcl8.6 ${libdir}/tcl8"
FILES_${PN}-dev += "${libdir}/tclConfig.sh ${libdir}/tclooConfig.sh"
ALTERNATIVE_${PN}-doc = "Thread.3"
ALTERNATIVE_LINK_NAME[Thread.3] = "${mandir}/man3/Thread.3"
# isn't getting picked up by shlibs code
RDEPENDS_${PN} += "tcl-lib"
RDEPENDS_${PN}_class-native = ""