summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2014-08-21 18:24:42 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-08-23 23:01:57 +0100
commit2bdd29428326d0d35e8e839713761efc22aee0fb (patch)
tree2d955eddefaa7ec6fb7c3033acfca47a73545e38 /meta
parent5a3a7e0f746ad5dd160bc297d8c8b0e770630d89 (diff)
downloadpoky-2bdd29428326d0d35e8e839713761efc22aee0fb.tar.gz
sudo: remove volatile configuration file
The new version of sudo has fixed the problem and will create the directory if it doesn't exist. So the configuration file is no longer needed. (From OE-Core rev: 7c962ca5d01ae4b9f511bb2b3b7700f970051727) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-extended/sudo/files/volatiles.99_sudo1
-rw-r--r--meta/recipes-extended/sudo/sudo_1.8.10p3.bb7
2 files changed, 2 insertions, 6 deletions
diff --git a/meta/recipes-extended/sudo/files/volatiles.99_sudo b/meta/recipes-extended/sudo/files/volatiles.99_sudo
deleted file mode 100644
index ecb576eaa3..0000000000
--- a/meta/recipes-extended/sudo/files/volatiles.99_sudo
+++ /dev/null
@@ -1 +0,0 @@
1d root root 0755 /var/run/sudo none
diff --git a/meta/recipes-extended/sudo/sudo_1.8.10p3.bb b/meta/recipes-extended/sudo/sudo_1.8.10p3.bb
index 46d47817e5..4c53032c5d 100644
--- a/meta/recipes-extended/sudo/sudo_1.8.10p3.bb
+++ b/meta/recipes-extended/sudo/sudo_1.8.10p3.bb
@@ -2,7 +2,7 @@ require sudo.inc
2 2
3SRC_URI = "http://ftp.sudo.ws/sudo/dist/sudo-${PV}.tar.gz \ 3SRC_URI = "http://ftp.sudo.ws/sudo/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://volatiles.99_sudo" 5 "
6 6
7PAM_SRC_URI = "file://sudo.pam" 7PAM_SRC_URI = "file://sudo.pam"
8 8
@@ -22,9 +22,6 @@ do_install_append () {
22 chmod 4111 ${D}${bindir}/sudo 22 chmod 4111 ${D}${bindir}/sudo
23 chmod 0440 ${D}${sysconfdir}/sudoers 23 chmod 0440 ${D}${sysconfdir}/sudoers
24 24
25 # Explicitly remove the ${localstatedir}/run directory as we can 25 # Explicitly remove the ${localstatedir}/run directory to avoid QA error
26 # manage it by a configuration file under ${sysconfdir}/default/volatiles/
27 rmdir -p --ignore-fail-on-non-empty ${D}${localstatedir}/run/sudo 26 rmdir -p --ignore-fail-on-non-empty ${D}${localstatedir}/run/sudo
28 install -d ${D}/${sysconfdir}/default/volatiles
29 install -m 644 ${WORKDIR}/volatiles.99_sudo ${D}/${sysconfdir}/default/volatiles/99_sudo
30} 27}