summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/sudo/files/0001-sudo.conf.in-fix-conflict-with-multilib.patch
diff options
context:
space:
mode:
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.patch7
1 files changed, 3 insertions, 4 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
index 041c717e00..1989c5abd7 100644
--- 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
@@ -1,4 +1,4 @@
1From 6e835350b7413210c410d3578cfab804186b7a4f Mon Sep 17 00:00:00 2001 1From 8c69192754ba73dd6e3273728a21aa73988f4bfb Mon Sep 17 00:00:00 2001
2From: Kai Kang <kai.kang@windriver.com> 2From: Kai Kang <kai.kang@windriver.com>
3Date: Tue, 17 Nov 2020 11:13:40 +0800 3Date: Tue, 17 Nov 2020 11:13:40 +0800
4Subject: [PATCH] sudo.conf.in: fix conflict with multilib 4Subject: [PATCH] sudo.conf.in: fix conflict with multilib
@@ -15,13 +15,12 @@ Update the comments in sudo.conf.in to avoid the conflict.
15Signed-off-by: Kai Kang <kai.kang@windriver.com> 15Signed-off-by: Kai Kang <kai.kang@windriver.com>
16 16
17Upstream-Status: Inappropriate [OE configuration specific] 17Upstream-Status: Inappropriate [OE configuration specific]
18
19--- 18---
20 examples/sudo.conf.in | 8 ++++---- 19 examples/sudo.conf.in | 8 ++++----
21 1 file changed, 4 insertions(+), 4 deletions(-) 20 1 file changed, 4 insertions(+), 4 deletions(-)
22 21
23diff --git a/examples/sudo.conf.in b/examples/sudo.conf.in 22diff --git a/examples/sudo.conf.in b/examples/sudo.conf.in
24index 2187457..0908d24 100644 23index bdd676c..094341c 100644
25--- a/examples/sudo.conf.in 24--- a/examples/sudo.conf.in
26+++ b/examples/sudo.conf.in 25+++ b/examples/sudo.conf.in
27@@ -4,7 +4,7 @@ 26@@ -4,7 +4,7 @@
@@ -53,7 +52,7 @@ index 2187457..0908d24 100644
53 # Sudo plugin directory: 52 # Sudo plugin directory:
54@@ -74,7 +74,7 @@ 53@@ -74,7 +74,7 @@
55 # The default directory to use when searching for plugins that are 54 # The default directory to use when searching for plugins that are
56 # specified without a fully qualified path name. 55 # specified without a fully-qualified path name.
57 # 56 #
58-#Path plugin_dir @plugindir@ 57-#Path plugin_dir @plugindir@
59+#Path plugin_dir $plugindir 58+#Path plugin_dir $plugindir