diff options
-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 @@ | |||
1 | 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 | |||
2 | 2 | ||
3 | SRC_URI = "http://ftp.sudo.ws/sudo/dist/sudo-${PV}.tar.gz \ | 3 | SRC_URI = "http://ftp.sudo.ws/sudo/dist/sudo-${PV}.tar.gz \ |
4 | ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \ | 4 | ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \ |
5 | file://volatiles.99_sudo" | 5 | " |
6 | 6 | ||
7 | PAM_SRC_URI = "file://sudo.pam" | 7 | PAM_SRC_URI = "file://sudo.pam" |
8 | 8 | ||
@@ -22,9 +22,6 @@ do_install_append () { | |||
22 | chmod 4111 ${D}${bindir}/sudo | 22 | chmod 4111 ${D}${bindir}/sudo |
23 | chmod 0440 ${D}${sysconfdir}/sudoers | 23 | chmod 0440 ${D}${sysconfdir}/sudoers |
24 | 24 | ||
25 | # Explicitly remove the ${localstatedir}/run directory as we can | 25 | # Explicitly remove the ${localstatedir}/run directory to avoid QA error |
26 | # manage it by a configuration file under ${sysconfdir}/default/volatiles/ | ||
27 | rmdir -p --ignore-fail-on-non-empty ${D}${localstatedir}/run/sudo | 26 | rmdir -p --ignore-fail-on-non-empty ${D}${localstatedir}/run/sudo |
28 | install -d ${D}/${sysconfdir}/default/volatiles | ||
29 | install -m 644 ${WORKDIR}/volatiles.99_sudo ${D}/${sysconfdir}/default/volatiles/99_sudo | ||
30 | } | 27 | } |