]> code.ossystems Code Review - openembedded-core.git/commitdiff
groff: fix multilib install file conflicts
authorKai Kang <kai.kang@windriver.com>
Sat, 29 Sep 2018 05:43:50 +0000 (13:43 +0800)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Sat, 29 Sep 2018 14:09:33 +0000 (15:09 +0100)
Perl scripts ${bindir}/{gpinyin, groffer, grog} are ${libdir} related
and cause multilib install file conflicts:

| Error: Transaction check error:
|  file /usr/bin/gpinyin conflicts between attempted installs of groff-1.22.3-r0.core2_64 and lib32-groff-1.22.3-r0.x86
|  file /usr/bin/groffer conflicts between attempted installs of groff-1.22.3-r0.core2_64 and lib32-groff-1.22.3-r0.x86
|  file /usr/bin/grog conflicts between attempted installs of groff-1.22.3-r0.core2_64 and lib32-groff-1.22.3-r0.x86

Inherit multilib_script.bbclass to fix the errors.

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

index 7472f5982572956070c64799fea66f5cf7982b06..ce7ce3e7916ff4e21f7c6ab1724ea52941bd6ec7 100644 (file)
@@ -20,7 +20,9 @@ DEPENDS = "groff-native"
 DEPENDS_class-native = ""
 RDEPENDS_${PN} += "perl sed"
 
-inherit autotools texinfo
+inherit autotools texinfo multilib_script
+
+MULTILIB_SCRIPTS = "${PN}:${bindir}/gpinyin ${PN}:${bindir}/groffer ${PN}:${bindir}/grog"
 
 EXTRA_OECONF = "--without-x"
 PARALLEL_MAKE = ""