]> 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)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Thu, 25 May 2023 11:35:37 +0000 (12:35 +0100)
commitf836541bcfdbf033a37537530b4e3b87b0a7f003
tree4f972da6d52b267a6bde95513f088d6b8e77d424
parentcfc4586b4bf080a3a4aa419dffc76c5da2a95b74
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>
meta/recipes-bsp/pm-utils/pm-utils_1.4.1.bb