[oe-commits] [openembedded-core] 15/19: perl/tcl: fix /usr/share/man/man3/Thread.3 conflicts

git at git.openembedded.org git at git.openembedded.org
Mon Dec 30 10:57:07 UTC 2019


This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit 553701e72e9fb14d79d18b28c8dd688f8a84c1f4
Author: Hongxu Jia <hongxu.jia at windriver.com>
AuthorDate: Sat Dec 21 14:19:35 2019 +0800

    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 at windriver.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/recipes-devtools/perl/perl_5.30.1.bb | 6 +++++-
 meta/recipes-devtools/tcltk/tcl_8.6.10.bb | 5 ++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-devtools/perl/perl_5.30.1.bb b/meta/recipes-devtools/perl/perl_5.30.1.bb
index 9b1f1af..6e0b200 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"
diff --git a/meta/recipes-devtools/tcltk/tcl_8.6.10.bb b/meta/recipes-devtools/tcltk/tcl_8.6.10.bb
index 284f20e..aedd96b 100644
--- a/meta/recipes-devtools/tcltk/tcl_8.6.10.bb
+++ b/meta/recipes-devtools/tcltk/tcl_8.6.10.bb
@@ -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 = ""

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the Openembedded-commits mailing list