diff options
author | Chen Qi <Qi.Chen@windriver.com> | 2014-08-21 14:52:45 +0800 |
---|---|---|
committer | Chen Qi <Qi.Chen@windriver.com> | 2014-08-21 18:23:31 +0800 |
commit | 7211f8ccf6146628f0731d19cf9c4b6f01cb771f (patch) | |
tree | 31ecf75a5b46614063e4ca32311a5f17fc6c9bbe | |
parent | 47d1fc9f5c38f3d092937c47bd4c2f45adaa7fe6 (diff) | |
download | openembedded-core-contrib-7211f8ccf6146628f0731d19cf9c4b6f01cb771f.tar.gz |
sudo: remove volatile configuration fileChenQi/sudo_volatile
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>
-rw-r--r-- | meta/recipes-extended/sudo/files/volatiles.99_sudo | 1 | ||||
-rw-r--r-- | meta/recipes-extended/sudo/sudo_1.8.10p3.bb | 7 |
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 } |