summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/sudo
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:33 +0100
commit7c962ca5d01ae4b9f511bb2b3b7700f970051727 (patch)
tree17116df91dc94193037b81dfa52d35e0e108eaac /meta/recipes-extended/sudo
parent177aec177306e68bcd822dee6b29a7efbd558a91 (diff)
downloadopenembedded-core-7c962ca5d01ae4b9f511bb2b3b7700f970051727.tar.gz
openembedded-core-7c962ca5d01ae4b9f511bb2b3b7700f970051727.tar.bz2
openembedded-core-7c962ca5d01ae4b9f511bb2b3b7700f970051727.zip
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. Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/sudo')
-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 @@
-d 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
SRC_URI = "http://ftp.sudo.ws/sudo/dist/sudo-${PV}.tar.gz \
${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \
- file://volatiles.99_sudo"
+ "
PAM_SRC_URI = "file://sudo.pam"
@@ -22,9 +22,6 @@ do_install_append () {
chmod 4111 ${D}${bindir}/sudo
chmod 0440 ${D}${sysconfdir}/sudoers
- # Explicitly remove the ${localstatedir}/run directory as we can
- # manage it by a configuration file under ${sysconfdir}/default/volatiles/
+ # Explicitly remove the ${localstatedir}/run directory to avoid QA error
rmdir -p --ignore-fail-on-non-empty ${D}${localstatedir}/run/sudo
- install -d ${D}/${sysconfdir}/default/volatiles
- install -m 644 ${WORKDIR}/volatiles.99_sudo ${D}/${sysconfdir}/default/volatiles/99_sudo
}