busybox: update from 1.8.2 to 1.9.1 (from OE)

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3889 311d38ba-8fff-0310-9ca6-ca027cbcb966

1 files changed, 111 insertions, 16 deletions

diff --git a/meta/packages/busybox/busybox.inc b/meta/packages/busybox/busybox.inc
index ab17d96db4..0fb3b5efff 100644
--- a/meta/packages/busybox/busybox.inc
+++ b/meta/packages/busybox/busybox.inc
@@ -11,19 +11,21 @@ LICENSE = "GPL"
 SECTION = "base"
 PRIORITY = "required"
 
-SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
-           file://busybox-cron \
-           file://busybox-httpd \
-           file://busybox-udhcpd \
-           file://default.script \
-           file://dhcp-hostname.patch;patch=1 \
-           file://hwclock.sh \
-           file://ifupdown-spurious-environ.patch;patch=1 \
-           file://mount.busybox \
-           file://syslog \
-           file://syslog.conf \
-           file://udhcpscript.patch;patch=1 \
-           file://umount.busybox"
+SRC_URI = "\
+  http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
+  file://busybox-cron \
+  file://busybox-httpd \
+  file://busybox-udhcpd \
+  file://default.script \
+  file://dhcp-hostname.patch;patch=1 \
+  file://hwclock.sh \
+  file://ifupdown-spurious-environ.patch;patch=1 \
+  file://mount.busybox \
+  file://syslog \
+  file://syslog.conf \
+  file://udhcpscript.patch;patch=1 \
+  file://umount.busybox \
+"
 
 SRC_URI_append_nylon = " file://xargs-double-size.patch;patch=1"
 
@@ -34,7 +36,7 @@ PACKAGES =+ "${PN}-httpd ${PN}-udhcpd"
 FILES_${PN}-httpd = "${sysconfdir}/init.d/busybox-httpd /srv/www"
 FILES_${PN}-udhcpd = "${sysconfdir}/init.d/busybox-udhcpd"
 
-FILES_${PN} += " ${datadir}/udhcpc"
+FILES_${PN} += "${datadir}/udhcpc"
 
 INITSCRIPT_PACKAGES = "${PN} ${PN}-httpd ${PN}-udhcpd"
 INITSCRIPT_NAME_${PN}-httpd = "busybox-httpd"
@@ -47,11 +49,73 @@ INITSCRIPT_PARAMS_${PN}_slugos = "start 20 ."
 
 inherit cml1 update-rc.d
 
-do_compile () {
-        unset CFLAGS
+do_compile() {
+        unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
         base_do_compile
 }
 
+do_install () {
+        unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
+        install -d ${D}${sysconfdir}/init.d
+        oe_runmake "PREFIX=${D}" install
+        cp -pPR ${S}/_install/* ${D}/
+
+        # Move everything to /busybox (not supposed to end up in any package)
+        install -d ${D}/busybox
+        ls ${D} -R
+
+        cp -dPr ${D}${base_bindir} ${D}${base_sbindir} ${D}${prefix} ${D}/busybox/
+        # Move the busybox binary back to /bin
+        install -d ${D}${base_bindir}
+        mv ${D}/busybox${base_bindir}/busybox ${D}${base_bindir}/
+        # 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 644 ${WORKDIR}/syslog.conf ${D}${sysconfdir}/
+        if grep "CONFIG_CROND=y" ${WORKDIR}/defconfig; then
+                # Move crond back to /usr/sbin/crond
+                install -d ${D}${sbindir}
+                mv ${D}/busybox${sbindir}/crond ${D}${sbindir}/
+
+                install -m 0755 ${WORKDIR}/busybox-cron ${D}${sysconfdir}/init.d/
+        fi
+        if grep "CONFIG_HTTPD=y" ${WORKDIR}/defconfig; then
+                # Move httpd back to /usr/sbin/httpd
+                install -d ${D}${sbindir}
+                mv ${D}/busybox${sbindir}/httpd ${D}${sbindir}/
+
+                install -m 0755 ${WORKDIR}/busybox-httpd ${D}${sysconfdir}/init.d/
+                install -d ${D}/srv/www
+        fi
+        if grep "CONFIG_APP_UDHCPD=y" ${WORKDIR}/defconfig; then
+                # Move udhcpd back to /usr/sbin/udhcpd
+                install -d ${D}${sbindir}
+                mv ${D}/busybox${sbindir}/udhcpd ${D}${sbindir}/
+
+                install -m 0755 ${WORKDIR}/busybox-udhcpd ${D}${sysconfdir}/init.d/
+        fi
+        if grep "CONFIG_HWCLOCK=y" ${WORKDIR}/defconfig; then
+                # Move hwclock back to /sbin/hwclock
+                install -d ${D}${base_sbindir}
+                mv ${D}/busybox${base_sbindir}/hwclock ${D}${base_sbindir}/
+
+                install -m 0755 ${WORKDIR}/hwclock.sh ${D}${sysconfdir}/init.d/
+        fi
+        if grep "CONFIG_APP_UDHCPC=y" ${WORKDIR}/defconfig; then
+                # Move dhcpc back to /usr/sbin/udhcpc
+                install -d ${D}${base_sbindir}
+                mv ${D}/busybox${base_sbindir}/udhcpc ${D}${base_sbindir}/
+
+                install -d ${D}${sysconfdir}/udhcpc.d
+                install -d ${D}${datadir}/udhcpc
+                install -m 0755 ${S}/examples/udhcp/simple.script ${D}${sysconfdir}/udhcpc.d/50default
+                install -m 0755 ${WORKDIR}/default.script ${D}${datadir}/udhcpc/default.script
+        fi
+
+        install -m 0644 ${S}/busybox.links ${D}${sysconfdir}
+}
+
 pkg_postinst_${PN} () {
         # If we are not making an image we create links for the utilities that doesn't exist
         # so the update-alternatives script will get the utilities it needs
@@ -62,3 +126,34 @@ 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
 }
+
+pkg_prerm_${PN} () {
+        # This is so you can make busybox commit suicide - removing busybox with no other packages
+        # providing its files, this will make update-alternatives work, but the update-rc.d part
+        # for syslog, httpd and/or udhcpd will fail if there is no other package providing sh
+        tmpdir=`mktemp -d /tmp/busyboxrm-XXXXXX`
+        ln -s /bin/busybox $tmpdir/[
+        ln -s /bin/busybox $tmpdir/test
+        ln -s /bin/busybox $tmpdir/head
+        ln -s /bin/busybox $tmpdir/sh
+        ln -s /bin/busybox $tmpdir/basename
+        ln -s /bin/busybox $tmpdir/echo
+        ln -s /bin/busybox $tmpdir/mv
+        ln -s /bin/busybox $tmpdir/ln
+        ln -s /bin/busybox $tmpdir/dirname
+        ln -s /bin/busybox $tmpdir/rm
+        ln -s /bin/busybox $tmpdir/sed
+        ln -s /bin/busybox $tmpdir/sort
+        export PATH=$PATH:$tmpdir
+
+        while read link
+        do
+                case "$link" in
+                        /*/*/*) to="../../bin/busybox";;
+                        /bin/*) to="busybox";;
+                        /*/*) to="../bin/busybox";;
+                esac
+                bn=`basename $link`
+                sh /usr/bin/update-alternatives --remove $bn $to
+        done </etc/busybox.links
+}