diff options
author | Chen Qi <Qi.Chen@windriver.com> | 2014-08-21 18:24:42 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-08-23 23:01:57 +0100 |
commit | 2bdd29428326d0d35e8e839713761efc22aee0fb (patch) | |
tree | 2d955eddefaa7ec6fb7c3033acfca47a73545e38 /meta | |
parent | 5a3a7e0f746ad5dd160bc297d8c8b0e770630d89 (diff) | |
download | ast2050-yocto-poky-2bdd29428326d0d35e8e839713761efc22aee0fb.zip ast2050-yocto-poky-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_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 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 46d4781..4c53032 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 } |