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>

diff --git a/meta/recipes-extended/sudo/files/volatiles.99_sudo b/meta/recipes-extended/sudo/files/volatiles.99_sudo
deleted file mode 100644 (file)
index ecb576e..0000000
--- 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 46d47817e5d9fa5e365d1345fdbb3add68674381..4c53032c5d5fe7f041c10686f3fa9d2365b93a5b 100644 (file)
--- 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
 }