diff options
Diffstat (limited to 'meta/recipes-core/busybox/busybox.inc')
-rw-r--r-- | meta/recipes-core/busybox/busybox.inc | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc index fc6ca917cd..e936e59646 100644 --- a/meta/recipes-core/busybox/busybox.inc +++ b/meta/recipes-core/busybox/busybox.inc | |||
@@ -18,7 +18,7 @@ export EXTRA_LDFLAGS = "${LDFLAGS}" | |||
18 | PACKAGES =+ "${PN}-httpd ${PN}-udhcpd ${PN}-udhcpc ${PN}-syslog ${PN}-mdev ${PN}-hwclock" | 18 | PACKAGES =+ "${PN}-httpd ${PN}-udhcpd ${PN}-udhcpc ${PN}-syslog ${PN}-mdev ${PN}-hwclock" |
19 | 19 | ||
20 | FILES_${PN}-httpd = "${sysconfdir}/init.d/busybox-httpd /srv/www" | 20 | FILES_${PN}-httpd = "${sysconfdir}/init.d/busybox-httpd /srv/www" |
21 | FILES_${PN}-syslog = "${sysconfdir}/init.d/syslog* ${sysconfdir}/syslog-startup.conf*" | 21 | FILES_${PN}-syslog = "${sysconfdir}/init.d/syslog* ${sysconfdir}/syslog-startup.conf* ${systemd_unitdir}/system/syslog.service" |
22 | FILES_${PN}-mdev = "${sysconfdir}/init.d/mdev ${sysconfdir}/mdev.conf" | 22 | FILES_${PN}-mdev = "${sysconfdir}/init.d/mdev ${sysconfdir}/mdev.conf" |
23 | FILES_${PN}-udhcpd = "${sysconfdir}/init.d/busybox-udhcpd" | 23 | FILES_${PN}-udhcpd = "${sysconfdir}/init.d/busybox-udhcpd" |
24 | FILES_${PN}-udhcpc = "${sysconfdir}/udhcpc.d ${datadir}/udhcpc" | 24 | FILES_${PN}-udhcpc = "${sysconfdir}/udhcpc.d ${datadir}/udhcpc" |
@@ -32,12 +32,16 @@ INITSCRIPT_NAME_${PN}-mdev = "mdev" | |||
32 | INITSCRIPT_NAME_${PN}-hwclock = "hwclock.sh" | 32 | INITSCRIPT_NAME_${PN}-hwclock = "hwclock.sh" |
33 | INITSCRIPT_PARAMS_${PN}-mdev = "start 06 S ." | 33 | INITSCRIPT_PARAMS_${PN}-mdev = "start 06 S ." |
34 | INITSCRIPT_NAME_${PN}-udhcpd = "busybox-udhcpd" | 34 | INITSCRIPT_NAME_${PN}-udhcpd = "busybox-udhcpd" |
35 | |||
36 | SYSTEMD_PACKAGES = "${PN}-syslog" | ||
37 | SYSTEMD_SERVICE_${PN}-syslog = "${PN}-syslog.service" | ||
38 | |||
35 | CONFFILES_${PN}-syslog = "${sysconfdir}/syslog-startup.conf.${BPN}" | 39 | CONFFILES_${PN}-syslog = "${sysconfdir}/syslog-startup.conf.${BPN}" |
36 | CONFFILES_${PN}-mdev = "${sysconfdir}/mdev.conf" | 40 | CONFFILES_${PN}-mdev = "${sysconfdir}/mdev.conf" |
37 | 41 | ||
38 | RRECOMMENDS_${PN} = "${PN}-syslog ${PN}-udhcpc" | 42 | RRECOMMENDS_${PN} = "${PN}-syslog ${PN}-udhcpc" |
39 | 43 | ||
40 | inherit cml1 update-rc.d | 44 | inherit cml1 systemd update-rc.d |
41 | 45 | ||
42 | # internal helper | 46 | # internal helper |
43 | def busybox_cfg(feature, features, tokens, cnf, rem): | 47 | def busybox_cfg(feature, features, tokens, cnf, rem): |
@@ -213,6 +217,16 @@ do_install () { | |||
213 | fi | 217 | fi |
214 | fi | 218 | fi |
215 | install -m 0644 ${S}/busybox.links ${D}${sysconfdir} | 219 | install -m 0644 ${S}/busybox.links ${D}${sysconfdir} |
220 | |||
221 | if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then | ||
222 | install -d ${D}${systemd_unitdir}/system | ||
223 | sed 's,@base_sbindir@,${base_sbindir},g' < ${WORKDIR}/busybox-syslog.service.in \ | ||
224 | > ${D}${systemd_unitdir}/system/busybox-syslog.service | ||
225 | sed 's,@base_sbindir@,${base_sbindir},g' < ${WORKDIR}/busybox-klogd.service.in \ | ||
226 | > ${D}${systemd_unitdir}/system/busybox-klogd.service | ||
227 | |||
228 | ln -sf /dev/null ${D}${systemd_unitdir}/system/syslog.service | ||
229 | fi | ||
216 | } | 230 | } |
217 | 231 | ||
218 | inherit update-alternatives | 232 | inherit update-alternatives |