summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWenzong Fan <wenzong.fan@windriver.com>2011-08-20 17:15:50 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-08-24 15:02:23 -0700
commit45a0c381673ccf7331c64e914a72bf88618c8dfa (patch)
treec5bdeb73e7432a41cc0cda70a66850d8266ce57a
parent9a623a6481eb6c5bf0f14a9e291d7cfac4ac1116 (diff)
downloadpoky-45a0c381673ccf7331c64e914a72bf88618c8dfa.tar.gz
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. (From OE-Core rev: 0fa1989b03cf70c7f27629c8340963fcef862097) Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xmeta/recipes-extended/cronie/cronie/crond.init2
-rw-r--r--meta/recipes-extended/cronie/cronie_1.4.8.bb8
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
21# Source function library. 21# Source function library.
22. /etc/init.d/functions 22. /etc/init.d/functions
23 23
24UID=`id -u`
25
26case "$1" in 24case "$1" in
27 start) 25 start)
28 if [ $UID -ne 0 ] ; then 26 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 \
15SECTION = "utils" 15SECTION = "utils"
16 16
17DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" 17DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
18PR = "r0" 18RDEPENDS_${PN} = "${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_DEPS}', '', d)}"
19PAM_DEPS = "libpam libpam-runtime pam-plugin-access pam-plugin-loginuid"
20
21PR = "r1"
19 22
20SRC_URI = "https://fedorahosted.org/releases/c/r/cronie/cronie-${PV}.tar.gz \ 23SRC_URI = "https://fedorahosted.org/releases/c/r/cronie/cronie-${PV}.tar.gz \
21 file://crond.init \ 24 file://crond.init \
@@ -31,7 +34,7 @@ SRC_URI[sha256sum] = "a3b910876f255712f1a5c364b74f34b0ceac9f6f3bbc45e854c5722785
31inherit autotools update-rc.d 34inherit autotools update-rc.d
32 35
33EXTRA_OECONF += "\ 36EXTRA_OECONF += "\
34 ${@base_contains('DISTRO_FEATURES', 'pam', '--with-libpam', '--without-libpam', d)}" 37 ${@base_contains('DISTRO_FEATURES', 'pam', '--with-pam', '--without-pam', d)}"
35 38
36INITSCRIPT_NAME = "crond" 39INITSCRIPT_NAME = "crond"
37INITSCRIPT_PARAMS = "start 90 2 3 4 5 . stop 60 0 1 6 ." 40INITSCRIPT_PARAMS = "start 90 2 3 4 5 . stop 60 0 1 6 ."
@@ -50,6 +53,7 @@ do_install_append () {
50 mkdir -p ${D}${sysconfdir}/cron.daily 53 mkdir -p ${D}${sysconfdir}/cron.daily
51 mkdir -p ${D}${sysconfdir}/cron.weekly 54 mkdir -p ${D}${sysconfdir}/cron.weekly
52 mkdir -p ${D}${sysconfdir}/cron.monthly 55 mkdir -p ${D}${sysconfdir}/cron.monthly
56 touch ${D}${sysconfdir}/cron.deny
53} 57}
54 58
55FILES_${PN} += "${sysconfdir}/cron*" 59FILES_${PN} += "${sysconfdir}/cron*"