]> code.ossystems Code Review - openembedded-core.git/commit
sudo: fix multilib conflict
authorKai Kang <kai.kang@windriver.com>
Tue, 17 Nov 2020 03:13:40 +0000 (11:13 +0800)
committerAnuj Mittal <anuj.mittal@intel.com>
Thu, 10 Dec 2020 00:32:51 +0000 (08:32 +0800)
commit9d67dd5a6363b9fae10784e8056e469ba2ef5735
treea5ad9c83e613edaa1c1af3dfcc21ee11e9419140
parent4116c4bbc896d0b445efc294603f02dedd0d3674
sudo: fix multilib conflict

It fails to install sudo and lib32-sudo at same time:

| Error: Transaction test error:
|  file /usr/libexec/sudo/audit_json.so conflicts between attempted
     installs of lib32-sudo-1.9.3p1-r0.core2_32 and sudo-1.9.3p1-r0.core2_64
|  file /usr/libexec/sudo/group_file.so conflicts between attempted
     installs of lib32-sudo-1.9.3p1-r0.core2_32 and sudo-1.9.3p1-r0.core2_64

Pass ${libdir} to configure option --libexecdir of sudo that it installs
plugin libraries to /usr/lib{,64} rather than /usr/libexec/. Then add a
patch to fix multilib conflict of sudo.conf.

[RP: Add missing Upstream-Status]
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit c9b6974cfcac370c6848d28400e0546ac85512e9)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
meta/recipes-extended/sudo/files/0001-sudo.conf.in-fix-conflict-with-multilib.patch [new file with mode: 0644]
meta/recipes-extended/sudo/sudo_1.9.3.bb