summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/sysklogd
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2010-10-20 14:50:50 -0500
committerRichard Purdie <rpurdie@linux.intel.com>2010-10-21 14:05:57 +0100
commitf1a209b142d2319d2594b051c01d9997184bfcb4 (patch)
treea5c6fb9678888fe3c94a5edd680258aef966b270 /meta/recipes-extended/sysklogd
parent70c77123084d6ef579dae0efde1c1b454827e597 (diff)
downloadpoky-f1a209b142d2319d2594b051c01d9997184bfcb4.tar.gz
busybox/sysklogd: syslog.conf files
The format of the syslog.conf files is different between busybox and sysklogd. Use the alternatives method to ensure we get the correct config file for any specific configurations. Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Diffstat (limited to 'meta/recipes-extended/sysklogd')
-rw-r--r--meta/recipes-extended/sysklogd/sysklogd.inc5
-rw-r--r--meta/recipes-extended/sysklogd/sysklogd_1.5.bb2
2 files changed, 5 insertions, 2 deletions
diff --git a/meta/recipes-extended/sysklogd/sysklogd.inc b/meta/recipes-extended/sysklogd/sysklogd.inc
index 9bd77280aa..11832b5a20 100644
--- a/meta/recipes-extended/sysklogd/sysklogd.inc
+++ b/meta/recipes-extended/sysklogd/sysklogd.inc
@@ -22,6 +22,7 @@ SRC_URI = "http://www.infodrom.org/projects/sysklogd/download/sysklogd-${PV}.tar
22 " 22 "
23 23
24INITSCRIPT_NAME = "syslog" 24INITSCRIPT_NAME = "syslog"
25CONFFILES_${PN} = "${sysconfdir}/syslog.conf.${PN}"
25 26
26CFLAGS_append = " -DSYSV" 27CFLAGS_append = " -DSYSV"
27 28
@@ -34,7 +35,7 @@ do_install () {
34 mv ${D}${base_sbindir}/syslogd ${D}${base_sbindir}/syslogd.${PN} 35 mv ${D}${base_sbindir}/syslogd ${D}${base_sbindir}/syslogd.${PN}
35 mv ${D}${base_sbindir}/klogd ${D}${base_sbindir}/klogd.${PN} 36 mv ${D}${base_sbindir}/klogd ${D}${base_sbindir}/klogd.${PN}
36 install -d ${D}${sysconfdir} 37 install -d ${D}${sysconfdir}
37 install -m 644 ${WORKDIR}/syslog.conf ${D}${sysconfdir}/syslog.conf 38 install -m 644 ${WORKDIR}/syslog.conf ${D}${sysconfdir}/syslog.conf.${PN}
38 install -d ${D}${sysconfdir}/init.d 39 install -d ${D}${sysconfdir}/init.d
39 install -m 755 ${WORKDIR}/sysklogd ${D}${sysconfdir}/init.d/syslog.${PN} 40 install -m 755 ${WORKDIR}/sysklogd ${D}${sysconfdir}/init.d/syslog.${PN}
40} 41}
@@ -55,6 +56,7 @@ pkg_postinst_${PN} () {
55 update-alternatives --install ${base_sbindir}/syslogd syslogd syslogd.${PN} 100 56 update-alternatives --install ${base_sbindir}/syslogd syslogd syslogd.${PN} 100
56 update-alternatives --install ${base_sbindir}/klogd klogd klogd.${PN} 100 57 update-alternatives --install ${base_sbindir}/klogd klogd klogd.${PN} 100
57 update-alternatives --install ${sysconfdir}/init.d/syslog syslog-init syslog.${PN} 100 58 update-alternatives --install ${sysconfdir}/init.d/syslog syslog-init syslog.${PN} 100
59 update-alternatives --install ${sysconfdir}/syslog.conf syslog-conf syslog.conf.${PN} 100
58 60
59 if test "x$D" != "x"; then 61 if test "x$D" != "x"; then
60 OPT="-r $D" 62 OPT="-r $D"
@@ -74,6 +76,7 @@ pkg_prerm_${PN} () {
74 fi 76 fi
75 fi 77 fi
76 update-alternatives --remove syslog-init syslog.${PN} 78 update-alternatives --remove syslog-init syslog.${PN}
79 update-alternatives --remove syslog-conf syslog.conf.${PN}
77} 80}
78 81
79pkg_postrm_${PN} () { 82pkg_postrm_${PN} () {
diff --git a/meta/recipes-extended/sysklogd/sysklogd_1.5.bb b/meta/recipes-extended/sysklogd/sysklogd_1.5.bb
index 27146c79ad..75c1147bc6 100644
--- a/meta/recipes-extended/sysklogd/sysklogd_1.5.bb
+++ b/meta/recipes-extended/sysklogd/sysklogd_1.5.bb
@@ -1,2 +1,2 @@
1require sysklogd.inc 1require sysklogd.inc
2PR = "r1" 2PR = "r2"