diff options
| author | Wenzong Fan <wenzong.fan@windriver.com> | 2011-08-20 17:15:50 +0800 |
|---|---|---|
| committer | Saul Wold <sgw@linux.intel.com> | 2011-08-24 08:47:30 -0700 |
| commit | 0fa1989b03cf70c7f27629c8340963fcef862097 (patch) | |
| tree | c725c13bac288812d4a6715588d539ca373c6c48 /meta/recipes-extended/cronie | |
| parent | cd5b601bb2149cbc866dc32b46f4058d3284fb00 (diff) | |
| download | openembedded-core-0fa1989b03cf70c7f27629c8340963fcef862097.tar.gz openembedded-core-0fa1989b03cf70c7f27629c8340963fcef862097.tar.bz2 openembedded-core-0fa1989b03cf70c7f27629c8340963fcef862097.zip | |
cronie: Updates to cronie
1) Add required pam plugins to RDEPENDS list;
2) Correct configure option that used for enable pam support;
3) Create empty crond config file cron.deny;
4) Don't set readonly variable UID in crond init script.
Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
Diffstat (limited to 'meta/recipes-extended/cronie')
| -rwxr-xr-x | meta/recipes-extended/cronie/cronie/crond.init | 2 | ||||
| -rw-r--r-- | meta/recipes-extended/cronie/cronie_1.4.8.bb | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/meta/recipes-extended/cronie/cronie/crond.init b/meta/recipes-extended/cronie/cronie/crond.init index 050c37e453..08f34beed9 100755 --- a/meta/recipes-extended/cronie/cronie/crond.init +++ b/meta/recipes-extended/cronie/cronie/crond.init @@ -21,8 +21,6 @@ CONFIG=/etc/sysconfig/crond # Source function library. . /etc/init.d/functions -UID=`id -u` - case "$1" in start) if [ $UID -ne 0 ] ; then diff --git a/meta/recipes-extended/cronie/cronie_1.4.8.bb b/meta/recipes-extended/cronie/cronie_1.4.8.bb index 4cfdfadf6f..064347e9d5 100644 --- a/meta/recipes-extended/cronie/cronie_1.4.8.bb +++ b/meta/recipes-extended/cronie/cronie_1.4.8.bb @@ -15,7 +15,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=963ea0772a2adbdcd607a9b2ec320c11 \ SECTION = "utils" DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" -PR = "r0" +RDEPENDS_${PN} = "${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_DEPS}', '', d)}" +PAM_DEPS = "libpam libpam-runtime pam-plugin-access pam-plugin-loginuid" + +PR = "r1" SRC_URI = "https://fedorahosted.org/releases/c/r/cronie/cronie-${PV}.tar.gz \ file://crond.init \ @@ -31,7 +34,7 @@ SRC_URI[sha256sum] = "a3b910876f255712f1a5c364b74f34b0ceac9f6f3bbc45e854c5722785 inherit autotools update-rc.d EXTRA_OECONF += "\ - ${@base_contains('DISTRO_FEATURES', 'pam', '--with-libpam', '--without-libpam', d)}" + ${@base_contains('DISTRO_FEATURES', 'pam', '--with-pam', '--without-pam', d)}" INITSCRIPT_NAME = "crond" INITSCRIPT_PARAMS = "start 90 2 3 4 5 . stop 60 0 1 6 ." @@ -50,6 +53,7 @@ do_install_append () { mkdir -p ${D}${sysconfdir}/cron.daily mkdir -p ${D}${sysconfdir}/cron.weekly mkdir -p ${D}${sysconfdir}/cron.monthly + touch ${D}${sysconfdir}/cron.deny } FILES_${PN} += "${sysconfdir}/cron*" |