summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/busybox/busybox.inc7
-rw-r--r--meta/recipes-core/busybox/busybox_1.16.2.bb2
-rw-r--r--meta/recipes-extended/sysklogd/sysklogd.inc5
-rw-r--r--meta/recipes-extended/sysklogd/sysklogd_1.5.bb2
4 files changed, 11 insertions, 5 deletions
diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc
index b8c009c1d3..24f9120a22 100644
--- a/meta/recipes-core/busybox/busybox.inc
+++ b/meta/recipes-core/busybox/busybox.inc
@@ -19,7 +19,7 @@ INITSCRIPT_PACKAGES = "${PN} ${PN}-httpd ${PN}-udhcpd"
19INITSCRIPT_NAME_${PN}-httpd = "busybox-httpd" 19INITSCRIPT_NAME_${PN}-httpd = "busybox-httpd"
20INITSCRIPT_NAME_${PN}-udhcpd = "busybox-udhcpd" 20INITSCRIPT_NAME_${PN}-udhcpd = "busybox-udhcpd"
21INITSCRIPT_NAME_${PN} = "syslog" 21INITSCRIPT_NAME_${PN} = "syslog"
22CONFFILES_${PN} = "${sysconfdir}/syslog.conf" 22CONFFILES_${PN} = "${sysconfdir}/syslog.conf.${PN}"
23 23
24# This disables the syslog startup links in slugos (see slugos-init) 24# This disables the syslog startup links in slugos (see slugos-init)
25INITSCRIPT_PARAMS_${PN}_slugos = "start 20 ." 25INITSCRIPT_PARAMS_${PN}_slugos = "start 20 ."
@@ -54,7 +54,7 @@ do_install () {
54 test -h ${D}/busybox${base_bindir}/sh && mv ${D}/busybox${base_bindir}/sh ${D}${base_bindir}/ 54 test -h ${D}/busybox${base_bindir}/sh && mv ${D}/busybox${base_bindir}/sh ${D}${base_bindir}/
55 55
56 install -m 0755 ${WORKDIR}/syslog ${D}${sysconfdir}/init.d/syslog.${PN} 56 install -m 0755 ${WORKDIR}/syslog ${D}${sysconfdir}/init.d/syslog.${PN}
57 install -m 644 ${WORKDIR}/syslog.conf ${D}${sysconfdir}/ 57 install -m 644 ${WORKDIR}/syslog.conf ${D}${sysconfdir}/syslog.conf.${PN}
58 if grep "CONFIG_CROND=y" ${WORKDIR}/defconfig; then 58 if grep "CONFIG_CROND=y" ${WORKDIR}/defconfig; then
59 # Move crond back to /usr/sbin/crond 59 # Move crond back to /usr/sbin/crond
60 install -d ${D}${sbindir} 60 install -d ${D}${sbindir}
@@ -109,6 +109,7 @@ pkg_postinst_${PN} () {
109 while read link; do case "$link" in /*/*/*) to="../../bin/busybox";; /bin/*) to="busybox";; /*/*) to="../bin/busybox";; esac; bn=`basename $link`; update-alternatives --install $link $bn $to 50; done <$D/etc/busybox.links 109 while read link; do case "$link" in /*/*/*) to="../../bin/busybox";; /bin/*) to="busybox";; /*/*) to="../bin/busybox";; esac; bn=`basename $link`; update-alternatives --install $link $bn $to 50; done <$D/etc/busybox.links
110 110
111 update-alternatives --install ${sysconfdir}/init.d/syslog syslog-init syslog.${PN} 50 111 update-alternatives --install ${sysconfdir}/init.d/syslog syslog-init syslog.${PN} 50
112 update-alternatives --install ${sysconfdir}/syslog.conf syslog-conf syslog.conf.${PN} 50
112} 113}
113 114
114pkg_prerm_${PN} () { 115pkg_prerm_${PN} () {
@@ -149,4 +150,6 @@ pkg_prerm_${PN} () {
149 fi 150 fi
150 151
151 update-alternatives --remove syslog-init syslog.${PN} 152 update-alternatives --remove syslog-init syslog.${PN}
153 update-alternatives --remove syslog-conf syslog.conf.${PN}
152} 154}
155
diff --git a/meta/recipes-core/busybox/busybox_1.16.2.bb b/meta/recipes-core/busybox/busybox_1.16.2.bb
index 80dbeaba60..82a62711e5 100644
--- a/meta/recipes-core/busybox/busybox_1.16.2.bb
+++ b/meta/recipes-core/busybox/busybox_1.16.2.bb
@@ -1,5 +1,5 @@
1require busybox.inc 1require busybox.inc
2PR = "r1" 2PR = "r2"
3 3
4SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ 4SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
5 file://udhcpscript.patch \ 5 file://udhcpscript.patch \
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"