sudo: remove volatile configuration file
cover sudo: remove volatile configuration file
The following changes since commit 47d1fc9f5c38f3d092937c47bd4c2f45adaa7fe6:
qemu: fix Darwin cross-compilation (2014-08-18 20:43:24 +0100)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib ChenQi/sudo_volatile
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=ChenQi/sudo_volatile
Chen Qi (1):
sudo: remove volatile configuration file
meta/recipes-extended/sudo/sudo_1.8.10p3.bb | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
Signature · 1 line
1.7.9.5
PATCH 1/1 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.
--- meta/recipes-extended/sudo/sudo_1.8.10p3.bb | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
meta/recipes-extended/sudo/sudo_1.8.10p3.bb +2 -5
@@ -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 }
Signature · 1 line
1.7.9.5
We should remove volatiles.99_sudo file also.
//Hongxu
Quoted 33 lines · Chen Qi
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 <[email protected]>--- meta/recipes-extended/sudo/sudo_1.8.10p3.bb | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)meta/recipes-extended/sudo/sudo_1.8.10p3.bb +2
-5@@ -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 }