summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai Kang <kai.kang@windriver.com>2020-11-17 11:13:40 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-11-24 15:49:32 +0000
commit8c28435258ea28dadbbbe9506beae700c226c379 (patch)
treec486fa6b3e4d37f76f3386f7294e5ca541316be6
parent37b51ed0764e7dd953448e61757a91df31dd11a0 (diff)
downloadpoky-8c28435258ea28dadbbbe9506beae700c226c379.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] (From OE-Core rev: c9b6974cfcac370c6848d28400e0546ac85512e9) Signed-off-by: Kai Kang <kai.kang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/sudo/files/0001-sudo.conf.in-fix-conflict-with-multilib.patch52
-rw-r--r--meta/recipes-extended/sudo/sudo_1.9.3p1.bb6
2 files changed, 56 insertions, 2 deletions
diff --git a/meta/recipes-extended/sudo/files/0001-sudo.conf.in-fix-conflict-with-multilib.patch b/meta/recipes-extended/sudo/files/0001-sudo.conf.in-fix-conflict-with-multilib.patch
new file mode 100644
index 0000000000..f7ccfdd623
--- /dev/null
+++ b/meta/recipes-extended/sudo/files/0001-sudo.conf.in-fix-conflict-with-multilib.patch
@@ -0,0 +1,52 @@
1sudo.conf.in: fix conflict with multilib
2
3When pass ${libdir} to --libexecdir of sudo, it fails to install sudo
4and lib32-sudo at same time:
5
6| Error: Transaction test error:
7| file /etc/sudo.conf conflicts between attempted installs of
8 sudo-1.9.3p1-r0.core2_64 and lib32-sudo-1.9.3p1-r0.core2_32
9
10Update the comments in sudo.conf.in to avoid the conflict.
11
12Signed-off-by: Kai Kang <kai.kang@windriver.com>
13
14Upstream-Status: Inappropriate [OE configuration specific]
15---
16 examples/sudo.conf.in | 6 +++---
17 1 file changed, 3 insertions(+), 3 deletions(-)
18
19diff --git a/examples/sudo.conf.in b/examples/sudo.conf.in
20index 19e33ff..af78235 100644
21--- a/examples/sudo.conf.in
22+++ b/examples/sudo.conf.in
23@@ -4,7 +4,7 @@
24 # Sudo plugins:
25 # Plugin plugin_name plugin_path plugin_options ...
26 #
27-# The plugin_path is relative to @plugindir@ unless
28+# The plugin_path is relative to $plugindir such as /usr/lib/sudo unless
29 # fully qualified.
30 # The plugin_name corresponds to a global symbol in the plugin
31 # that contains the plugin interface structure.
32@@ -50,7 +50,7 @@ Plugin sudoers_audit sudoers.so
33 # The compiled-in value is usually sufficient and should only be changed
34 # if you rename or move the sudo_noexec.so file.
35 #
36-#Path noexec @plugindir@/sudo_noexec.so
37+#Path noexec $plugindir/sudo_noexec.so
38
39 #
40 # Sudo plugin directory:
41@@ -59,7 +59,7 @@ Plugin sudoers_audit sudoers.so
42 # The default directory to use when searching for plugins that are
43 # specified without a fully qualified path name.
44 #
45-#Path plugin_dir @plugindir@
46+#Path plugin_dir $plugindir
47
48 #
49 # Sudo developer mode:
50--
512.17.1
52
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
2 2
3SRC_URI = "https://www.sudo.ws/dist/sudo-${PV}.tar.gz \ 3SRC_URI = "https://www.sudo.ws/dist/sudo-${PV}.tar.gz \
4 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \ 4 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \
5 file://0001-sudo.conf.in-fix-conflict-with-multilib.patch \
5 " 6 "
6 7
7PAM_SRC_URI = "file://sudo.pam" 8PAM_SRC_URI = "file://sudo.pam"
@@ -24,6 +25,7 @@ EXTRA_OECONF += " \
24 ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--enable-tmpfiles.d=${nonarch_libdir}/tmpfiles.d', '--disable-tmpfiles.d', d)} \ 25 ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--enable-tmpfiles.d=${nonarch_libdir}/tmpfiles.d', '--disable-tmpfiles.d', d)} \
25 --with-rundir=/run/sudo \ 26 --with-rundir=/run/sudo \
26 --with-vardir=/var/lib/sudo \ 27 --with-vardir=/var/lib/sudo \
28 --libexecdir=${libdir} \
27 " 29 "
28 30
29do_install_append () { 31do_install_append () {
@@ -43,5 +45,5 @@ do_install_append () {
43} 45}
44 46
45FILES_${PN} += "${nonarch_libdir}/tmpfiles.d" 47FILES_${PN} += "${nonarch_libdir}/tmpfiles.d"
46FILES_${PN}-dev += "${libexecdir}/${BPN}/lib*${SOLIBSDEV} ${libexecdir}/${BPN}/*.la \ 48FILES_${PN}-dev += "${libdir}/${BPN}/lib*${SOLIBSDEV} ${libdir}/${BPN}/*.la \
47 ${libexecdir}/lib*${SOLIBSDEV} ${libexecdir}/*.la" 49 ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la"