aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai Kang <kai.kang@windriver.com>2019-09-04 05:35:54 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-09-07 07:47:14 +0100
commit08b6a12e674f7a202bb29fbb465997e8303ccb5d (patch)
treeb2fac7539dd3091fa797fccadbd2dfb948ab3ac6
parent274bed042b9c2b50a8bdd11b42f1a62405fb5b11 (diff)
downloadopenembedded-core-contrib-08b6a12e674f7a202bb29fbb465997e8303ccb5d.tar.gz
openembedded-core-contrib-08b6a12e674f7a202bb29fbb465997e8303ccb5d.tar.bz2
openembedded-core-contrib-08b6a12e674f7a202bb29fbb465997e8303ccb5d.zip
texinfo: fix multilib file confliction
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>
-rw-r--r--meta/recipes-extended/texinfo/texinfo_6.5.bb4
1 files changed, 3 insertions, 1 deletions
diff --git a/meta/recipes-extended/texinfo/texinfo_6.5.bb b/meta/recipes-extended/texinfo/texinfo_6.5.bb
index f966457f88..50eae77ad0 100644
--- a/meta/recipes-extended/texinfo/texinfo_6.5.bb
+++ b/meta/recipes-extended/texinfo/texinfo_6.5.bb
@@ -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"