diff options
Diffstat (limited to 'meta/recipes-core/busybox')
| -rw-r--r-- | meta/recipes-core/busybox/busybox.inc | 13 | ||||
| -rw-r--r-- | meta/recipes-core/busybox/busybox_1.16.2.bb | 2 |
2 files changed, 13 insertions, 2 deletions
diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc index b3c6c6615..b8c009c1d 100644 --- a/meta/recipes-core/busybox/busybox.inc +++ b/meta/recipes-core/busybox/busybox.inc @@ -53,7 +53,7 @@ do_install () { # Move back the sh symlink test -h ${D}/busybox${base_bindir}/sh && mv ${D}/busybox${base_bindir}/sh ${D}${base_bindir}/ - install -m 0755 ${WORKDIR}/syslog ${D}${sysconfdir}/init.d/ + install -m 0755 ${WORKDIR}/syslog ${D}${sysconfdir}/init.d/syslog.${PN} install -m 644 ${WORKDIR}/syslog.conf ${D}${sysconfdir}/ if grep "CONFIG_CROND=y" ${WORKDIR}/defconfig; then # Move crond back to /usr/sbin/crond @@ -107,6 +107,8 @@ pkg_postinst_${PN} () { # This adds the links, remember that this has to work when building an image too, hence the $D 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 + + update-alternatives --install ${sysconfdir}/init.d/syslog syslog-init syslog.${PN} 50 } pkg_prerm_${PN} () { @@ -138,4 +140,13 @@ pkg_prerm_${PN} () { bn=`basename $link` sh /usr/bin/update-alternatives --remove $bn $to done </etc/busybox.links + + # remove syslog + if test "x$D" = "x"; then + if test "$1" = "upgrade" -o "$1" = "remove"; then + /etc/init.d/syslog stop + fi + fi + + update-alternatives --remove syslog-init syslog.${PN} } diff --git a/meta/recipes-core/busybox/busybox_1.16.2.bb b/meta/recipes-core/busybox/busybox_1.16.2.bb index 0952f4ddb..80dbeaba6 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 @@ require busybox.inc -PR = "r0" +PR = "r1" SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ file://udhcpscript.patch \ |