diff options
author | Kai Kang <kai.kang@windriver.com> | 2023-05-24 17:23:58 +0800 |
---|---|---|
committer | Steve Sakoman <steve@sakoman.com> | 2023-07-12 05:13:59 -1000 |
commit | 0a24a5bb3b98659fabfc1ba5a4b5cc830b3f04f8 (patch) | |
tree | 3815c87e256559def46562c030105ca942396a1d /meta/recipes-bsp | |
parent | f506b0c0574b12ff2cf6f320489faee74a4ed3cd (diff) | |
download | poky-0a24a5bb3b98659fabfc1ba5a4b5cc830b3f04f8.tar.gz |
pm-utils: fix multilib conflictions
It fails to instal pm-utils and lib32-pm-utils at same time:
Error: Transaction test error:
file /usr/bin/pm-is-supported conflicts between attempted installs of lib32-pm-utils-1.4.1-r1.corei7_32 and pm-utils-1.4.1-r1.corei7_64
file /usr/sbin/pm-hibernate conflicts between attempted installs of lib32-pm-utils-1.4.1-r1.corei7_32 and pm-utils-1.4.1-r1.corei7_64
file /usr/sbin/pm-powersave conflicts between attempted installs of lib32-pm-utils-1.4.1-r1.corei7_32 and pm-utils-1.4.1-r1.corei7_64
file /usr/sbin/pm-suspend conflicts between attempted installs of lib32-pm-utils-1.4.1-r1.corei7_32 and pm-utils-1.4.1-r1.corei7_64
file /usr/sbin/pm-suspend-hybrid conflicts between attempted installs of lib32-pm-utils-1.4.1-r1.corei7_32 and pm-utils-1.4.1-r1.corei7_64
All of the conflicted files either is script which source a file in
${libdir}, or a link file to some file in ${libdir}. Compare the content
of installed files in ${libdir} exclude binaries, only the paths of
${libdir} diff. So re-define libdir with ${nonarch_libdir} to fix the
conflicts.
(From OE-Core rev: 292ff56250d2f916370c508fd7a94f3ab769a356)
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit f836541bcfdbf033a37537530b4e3b87b0a7f003)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Diffstat (limited to 'meta/recipes-bsp')
-rw-r--r-- | meta/recipes-bsp/pm-utils/pm-utils_1.4.1.bb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/meta/recipes-bsp/pm-utils/pm-utils_1.4.1.bb b/meta/recipes-bsp/pm-utils/pm-utils_1.4.1.bb index cac09101c4..fa3b993788 100644 --- a/meta/recipes-bsp/pm-utils/pm-utils_1.4.1.bb +++ b/meta/recipes-bsp/pm-utils/pm-utils_1.4.1.bb | |||
@@ -19,9 +19,12 @@ PACKAGECONFIG[manpages] = "--enable-doc, --disable-doc, libxslt-native xmlto-nat | |||
19 | 19 | ||
20 | RDEPENDS_${PN} = "grep bash" | 20 | RDEPENDS_${PN} = "grep bash" |
21 | 21 | ||
22 | EXTRA_OECONF = "--libdir=${nonarch_libdir}" | ||
23 | |||
22 | do_configure_prepend () { | 24 | do_configure_prepend () { |
23 | ( cd ${S}; autoreconf -f -i -s ) | 25 | ( cd ${S}; autoreconf -f -i -s ) |
24 | } | 26 | } |
25 | 27 | ||
26 | FILES_${PN} += "${libdir}/${BPN}/*" | 28 | FILES_${PN} += "${nonarch_libdir}/${BPN}/*" |
27 | FILES_${PN}-dbg += "${datadir}/doc/pm-utils/README.debugging" | 29 | FILES_${PN}-dbg += "${datadir}/doc/pm-utils/README.debugging" |
30 | FILES_${PN}-dev += "${nonarch_libdir}/pkgconfig/pm-utils.pc" | ||