diff options
author | Kai Kang <kai.kang@windriver.com> | 2018-09-29 13:43:50 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-10-01 13:04:49 +0100 |
commit | 7481db95536a60a29e0246d5fcf093f792672e90 (patch) | |
tree | 795678c1adadca5c26c49bdf20758d40ec7c0711 /meta/recipes-extended | |
parent | 4612cb45ba3d025093a4118f71e50b99f66d3e94 (diff) | |
download | poky-7481db95536a60a29e0246d5fcf093f792672e90.tar.gz |
groff: fix multilib install file conflicts
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.
(From OE-Core rev: df90cb1f4ee8918b0bc2a281b2d77444a0d037e7)
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r-- | meta/recipes-extended/groff/groff_1.22.3.bb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/meta/recipes-extended/groff/groff_1.22.3.bb b/meta/recipes-extended/groff/groff_1.22.3.bb index 7472f59825..ce7ce3e791 100644 --- a/meta/recipes-extended/groff/groff_1.22.3.bb +++ b/meta/recipes-extended/groff/groff_1.22.3.bb | |||
@@ -20,7 +20,9 @@ DEPENDS = "groff-native" | |||
20 | DEPENDS_class-native = "" | 20 | DEPENDS_class-native = "" |
21 | RDEPENDS_${PN} += "perl sed" | 21 | RDEPENDS_${PN} += "perl sed" |
22 | 22 | ||
23 | inherit autotools texinfo | 23 | inherit autotools texinfo multilib_script |
24 | |||
25 | MULTILIB_SCRIPTS = "${PN}:${bindir}/gpinyin ${PN}:${bindir}/groffer ${PN}:${bindir}/grog" | ||
24 | 26 | ||
25 | EXTRA_OECONF = "--without-x" | 27 | EXTRA_OECONF = "--without-x" |
26 | PARALLEL_MAKE = "" | 28 | PARALLEL_MAKE = "" |