]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core.git/commit
pm-utils: fix multilib conflictions
authorKai Kang <kai.kang@windriver.com>
Wed, 24 May 2023 09:23:58 +0000 (17:23 +0800)
committerSteve Sakoman <steve@sakoman.com>
Fri, 7 Jul 2023 16:51:45 +0000 (06:51 -1000)
commit292ff56250d2f916370c508fd7a94f3ab769a356
tree0927bf3692eb1e6871679966b4d145673b559735
parent4342d2a60e2ba8a7aeb683b78f1eef94eb2c2edc
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.

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>
meta/recipes-bsp/pm-utils/pm-utils_1.4.1.bb