diff options
Diffstat (limited to 'meta/recipes-core/busybox')
-rw-r--r-- | meta/recipes-core/busybox/busybox.inc | 7 | ||||
-rw-r--r-- | meta/recipes-core/busybox/busybox_1.16.2.bb | 2 |
2 files changed, 6 insertions, 3 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" | |||
19 | INITSCRIPT_NAME_${PN}-httpd = "busybox-httpd" | 19 | INITSCRIPT_NAME_${PN}-httpd = "busybox-httpd" |
20 | INITSCRIPT_NAME_${PN}-udhcpd = "busybox-udhcpd" | 20 | INITSCRIPT_NAME_${PN}-udhcpd = "busybox-udhcpd" |
21 | INITSCRIPT_NAME_${PN} = "syslog" | 21 | INITSCRIPT_NAME_${PN} = "syslog" |
22 | CONFFILES_${PN} = "${sysconfdir}/syslog.conf" | 22 | CONFFILES_${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) |
25 | INITSCRIPT_PARAMS_${PN}_slugos = "start 20 ." | 25 | INITSCRIPT_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 | ||
114 | pkg_prerm_${PN} () { | 115 | pkg_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 @@ | |||
1 | require busybox.inc | 1 | require busybox.inc |
2 | PR = "r1" | 2 | PR = "r2" |
3 | 3 | ||
4 | SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ | 4 | SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ |
5 | file://udhcpscript.patch \ | 5 | file://udhcpscript.patch \ |