diff options
author | Kai Kang <kai.kang@windriver.com> | 2020-11-17 11:13:40 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-12-18 23:01:48 +0000 |
commit | 87af2a9001854e3a1c4ea83dab02df95256d5289 (patch) | |
tree | ea877337a01145b4de7a918ac9380979e41fccbe /meta/recipes-extended/sudo/files/0001-sudo.conf.in-fix-conflict-with-multilib.patch | |
parent | 94594f1cbf47d3fad9a921110be488753f6aa3ea (diff) | |
download | poky-87af2a9001854e3a1c4ea83dab02df95256d5289.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: 9d67dd5a6363b9fae10784e8056e469ba2ef5735)
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>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/sudo/files/0001-sudo.conf.in-fix-conflict-with-multilib.patch')
-rw-r--r-- | meta/recipes-extended/sudo/files/0001-sudo.conf.in-fix-conflict-with-multilib.patch | 52 |
1 files changed, 52 insertions, 0 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 @@ | |||
1 | sudo.conf.in: fix conflict with multilib | ||
2 | |||
3 | When pass ${libdir} to --libexecdir of sudo, it fails to install sudo | ||
4 | and 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 | |||
10 | Update the comments in sudo.conf.in to avoid the conflict. | ||
11 | |||
12 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | ||
13 | |||
14 | Upstream-Status: Inappropriate [OE configuration specific] | ||
15 | --- | ||
16 | examples/sudo.conf.in | 6 +++--- | ||
17 | 1 file changed, 3 insertions(+), 3 deletions(-) | ||
18 | |||
19 | diff --git a/examples/sudo.conf.in b/examples/sudo.conf.in | ||
20 | index 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 | -- | ||
51 | 2.17.1 | ||
52 | |||