diff options
| author |   Kai Kang <kai.kang@windriver.com> | 2020-11-17 11:13:40 +0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-11-24 15:49:28 +0000 |
| commit | c9b6974cfcac370c6848d28400e0546ac85512e9 (patch) | |
| tree | 88df02ea3e7771c5aa3247fd8b92f31f3f072a24 /meta/recipes-extended/sudo/sudo_1.9.3p1.bb | |
| parent | 37f37f4a52de3711973b372160f23672b61ff6ad (diff) | |
| download | openembedded-core-contrib-c9b6974cfcac370c6848d28400e0546ac85512e9.tar.gz | |
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>
Diffstat (limited to 'meta/recipes-extended/sudo/sudo_1.9.3p1.bb')
| -rw-r--r-- | meta/recipes-extended/sudo/sudo_1.9.3p1.bb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/meta/recipes-extended/sudo/sudo_1.9.3p1.bb b/meta/recipes-extended/sudo/sudo_1.9.3p1.bb index 08a0fa03a3..ba61a7f247 100644 --- a/meta/recipes-extended/sudo/sudo_1.9.3p1.bb +++ b/meta/recipes-extended/sudo/sudo_1.9.3p1.bb @@ -2,6 +2,7 @@ require sudo.inc SRC_URI = "https://www.sudo.ws/dist/sudo-${PV}.tar.gz \ ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \ + file://0001-sudo.conf.in-fix-conflict-with-multilib.patch \ " PAM_SRC_URI = "file://sudo.pam" @@ -24,6 +25,7 @@ EXTRA_OECONF += " \ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--enable-tmpfiles.d=${nonarch_libdir}/tmpfiles.d', '--disable-tmpfiles.d', d)} \ --with-rundir=/run/sudo \ --with-vardir=/var/lib/sudo \ + --libexecdir=${libdir} \ " do_install_append () { @@ -43,5 +45,5 @@ do_install_append () { } FILES_${PN} += "${nonarch_libdir}/tmpfiles.d" -FILES_${PN}-dev += "${libexecdir}/${BPN}/lib*${SOLIBSDEV} ${libexecdir}/${BPN}/*.la \ - ${libexecdir}/lib*${SOLIBSDEV} ${libexecdir}/*.la" +FILES_${PN}-dev += "${libdir}/${BPN}/lib*${SOLIBSDEV} ${libdir}/${BPN}/*.la \ + ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la" |