]> code.ossystems Code Review - openembedded-core.git/commitdiff
texinfo: fix multilib file confliction
authorKai Kang <kai.kang@windriver.com>
Wed, 4 Sep 2019 09:35:54 +0000 (05:35 -0400)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Sat, 7 Sep 2019 06:47:14 +0000 (07:47 +0100)
Inherit multilib_script to fix file confliction when mutlilib enabled.

| Error: Transaction check error:
|   file /usr/bin/texi2any conflicts between attempted installs of
    lib32-texinfo-6.5-r0.core2_32 and texinfo-6.5-r0.core2_64

Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/recipes-extended/texinfo/texinfo_6.5.bb

index f966457f8818336474b9e24973466ddb5ef81cdd..50eae77ad0a45274a52116365b09e9644a4795c8 100644 (file)
@@ -42,7 +42,9 @@ SRC_URI[sha256sum] = "d34272e4042c46186ddcd66bd5d980c0ca14ff734444686ccf8131f6ec
 
 tex_texinfo = "texmf/tex/texinfo"
 
-inherit gettext autotools
+inherit gettext autotools multilib_script
+
+MULTILIB_SCRIPTS = "${PN}:${bindir}/texi2any"
 
 EXTRA_AUTORECONF += "-I ${S}/gnulib/m4"