busybox: sync with .dev

4 files changed, 21 insertions, 11 deletions

diff --git a/packages/busybox/busybox-1.00/nylon/defconfig b/packages/busybox/busybox-1.00/nylon/defconfig
index 599051bafb..3e4257ef04 100644
--- a/packages/busybox/busybox-1.00/nylon/defconfig
+++ b/packages/busybox/busybox-1.00/nylon/defconfig
@@ -51,7 +51,7 @@ CONFIG_GZIP=y
 # CONFIG_RPM is not set
 CONFIG_TAR=y
 CONFIG_FEATURE_TAR_CREATE=y
-CONFIG_FEATURE_TAR_BZIP2=y
+# CONFIG_FEATURE_TAR_BZIP2 is not set
 CONFIG_FEATURE_TAR_FROM=y
 CONFIG_FEATURE_TAR_GZIP=y
 CONFIG_FEATURE_TAR_COMPRESS=y
diff --git a/packages/busybox/busybox-1.01/nylon/defconfig b/packages/busybox/busybox-1.01/nylon/defconfig
index 599051bafb..3e4257ef04 100644
--- a/packages/busybox/busybox-1.01/nylon/defconfig
+++ b/packages/busybox/busybox-1.01/nylon/defconfig
@@ -51,7 +51,7 @@ CONFIG_GZIP=y
 # CONFIG_RPM is not set
 CONFIG_TAR=y
 CONFIG_FEATURE_TAR_CREATE=y
-CONFIG_FEATURE_TAR_BZIP2=y
+# CONFIG_FEATURE_TAR_BZIP2 is not set
 CONFIG_FEATURE_TAR_FROM=y
 CONFIG_FEATURE_TAR_GZIP=y
 CONFIG_FEATURE_TAR_COMPRESS=y
diff --git a/packages/busybox/busybox_1.00.bb b/packages/busybox/busybox_1.00.bb
index 5b770669c1..296c4e080e 100644
--- a/packages/busybox/busybox_1.00.bb
+++ b/packages/busybox/busybox_1.00.bb
@@ -10,7 +10,7 @@ HOMEPAGE = "http://www.busybox.net"
 LICENSE = "GPL"
 SECTION = "base"
 PRIORITY = "required"
-PR = "r32"
+PR = "r37"
 
 SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
            file://add-getkey-applet.patch;patch=1 \
@@ -22,6 +22,7 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
 	   file://readlink.patch;patch=1 \
 	   file://iproute-flush-cache.patch;patch=1;pnum=0 \
 	   file://rmmod.patch;patch=1 \
+	   file://df.patch;patch=1 \
 	   file://below.patch;patch=1 \
 	   file://fbset.patch;patch=1 \
 	   file://mount-all-type.patch;patch=1 \
@@ -29,6 +30,9 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
 	   file://gzip-spurious-const.patch;patch=1 \
 	   file://ifupdown-spurious-environ.patch;patch=1 \
            file://uclibc_posix.patch;patch=1 \
+	   file://unzip-enhancement-and-fixes.patch;patch=1;pnum=0 \
+	   file://unzip-endian-fixes.patch;patch=1;pnum=0 \
+	   file://start-stop-daemon-oknodo-support.patch;patch=1 \
            file://defconfig \
            file://busybox-cron \
 	   file://busybox-httpd \
@@ -40,6 +44,10 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
 	   file://mount.busybox \
 	   file://umount.busybox"
 
+SRC_URI_append_nylon = " file://xargs-double-size.patch;patch=1"
+SRC_URI_append_mtx-1 = " file://linux-types.patch;patch=1"
+SRC_URI_append_mtx-2 = " file://linux-types.patch;patch=1"
+
 S = "${WORKDIR}/busybox-${PV}"
 
 export EXTRA_CFLAGS = "${CFLAGS}"
@@ -83,7 +91,7 @@ do_install () {
 	install -d ${D}${base_bindir}
 	mv ${D}/busybox${base_bindir}/busybox ${D}${base_bindir}/
 	# Move back the sh symlink
-	mv ${D}/busybox${base_bindir}/sh ${D}${base_bindir}/
+	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}/
@@ -146,6 +154,7 @@ pkg_prerm_${PN} () {
 	# 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`
+	cp -a /bin/busybox $tmpdir/
 	ln -s /bin/busybox $tmpdir/[
 	ln -s /bin/busybox $tmpdir/test
 	ln -s /bin/busybox $tmpdir/head
diff --git a/packages/busybox/busybox_1.01.bb b/packages/busybox/busybox_1.01.bb
index 1e2f41fcba..9c8b7e60c3 100644
--- a/packages/busybox/busybox_1.01.bb
+++ b/packages/busybox/busybox_1.01.bb
@@ -15,7 +15,7 @@ PR = "r12"
 SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
 	   file://udhcppidfile.patch;patch=1 \
 	   file://udhcppidfile-breakage.patch;patch=1 \
-	   file://add-getkey-applet.patch;patch=1 \
+           file://add-getkey-applet.patch;patch=1 \
 	   file://below.patch;patch=1 \
 	   file://dhcp-hostname.patch;patch=1 \
 	   file://dhcpretrytime.patch;patch=1 \
@@ -29,19 +29,20 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
 	   file://udhcpscript.patch;patch=1 \
 	   file://thumb-bsdlabel.patch;patch=1 \
 	   file://glibc2.4-icmp6.patch;patch=1 \
-	   file://uclibc_posix.patch;patch=1 \
-	   \
-	   file://defconfig \
-	   file://busybox-cron \
+           file://uclibc_posix.patch;patch=1 \
+           file://defconfig \
+           file://busybox-cron \
 	   file://busybox-httpd \
 	   file://busybox-udhcpd \
 	   file://syslog \
-	   file://hwclock.sh \
+           file://hwclock.sh \
 	   file://default.script \
 	   file://syslog.conf \
 	   file://mount.busybox \
 	   file://umount.busybox"
+
 SRC_URI_append_slugos += " file://sysctl.conf "
+SRC_URI_append_nylon = " file://xargs-double-size.patch;patch=1"
 
 S = "${WORKDIR}/busybox-${PV}"
 
@@ -86,7 +87,7 @@ do_install () {
 	install -d ${D}${base_bindir}
 	mv ${D}/busybox${base_bindir}/busybox ${D}${base_bindir}/
 	# Move back the sh symlink
-	mv ${D}/busybox${base_bindir}/sh ${D}${base_bindir}/
+	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}/