[oe-commits] org.oe.packaged-staging busybox: sync with .dev

[rpurdie commit]

busybox: sync with .dev

Author: rpurdie at openembedded.org
Branch: org.openembedded.packaged-staging
Revision: 85ed7437ca5becf313b332b01cbed3a5d907f0bc
ViewMTN: http://monotone.openembedded.org/revision.psp?id=85ed7437ca5becf313b332b01cbed3a5d907f0bc
Files:
1
packages/busybox/busybox-1.00/nylon/defconfig
packages/busybox/busybox-1.01/nylon/defconfig
packages/busybox/busybox_1.00.bb
packages/busybox/busybox_1.01.bb
Diffs:

#
# mt diff -r62203846b784ed14258633ec8fb6d75d80228407 -r85ed7437ca5becf313b332b01cbed3a5d907f0bc
#
# 
# 
# patch "packages/busybox/busybox-1.00/nylon/defconfig"
#  from [0460c3f9d3ca2a41da9beee283411657469e8b9a]
#    to [651802f1b59aa59045b6877465af0a3db9680a7a]
# 
# patch "packages/busybox/busybox-1.01/nylon/defconfig"
#  from [0460c3f9d3ca2a41da9beee283411657469e8b9a]
#    to [651802f1b59aa59045b6877465af0a3db9680a7a]
# 
# patch "packages/busybox/busybox_1.00.bb"
#  from [c9290b5fb7aaf91535725c9b19545ca1b932af79]
#    to [41ad13a8a72bcad463b63f3497460961e8c96d9d]
# 
# patch "packages/busybox/busybox_1.01.bb"
#  from [053a1b2673ae5244e90f71d2ad0aa48560f505d9]
#    to [d097d7782fd60adb5bfd5c2d8af0e1e39c5805dd]
# 
============================================================
--- packages/busybox/busybox-1.00/nylon/defconfig	0460c3f9d3ca2a41da9beee283411657469e8b9a
+++ packages/busybox/busybox-1.00/nylon/defconfig	651802f1b59aa59045b6877465af0a3db9680a7a
@@ -51,7 +51,7 @@ CONFIG_FEATURE_TAR_CREATE=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
============================================================
--- packages/busybox/busybox-1.01/nylon/defconfig	0460c3f9d3ca2a41da9beee283411657469e8b9a
+++ packages/busybox/busybox-1.01/nylon/defconfig	651802f1b59aa59045b6877465af0a3db9680a7a
@@ -51,7 +51,7 @@ CONFIG_FEATURE_TAR_CREATE=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
============================================================
--- packages/busybox/busybox_1.00.bb	c9290b5fb7aaf91535725c9b19545ca1b932af79
+++ packages/busybox/busybox_1.00.bb	41ad13a8a72bcad463b63f3497460961e8c96d9d
@@ -10,7 +10,7 @@ PRIORITY = "required"
 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/downlo
 	   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/downlo
 	   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/downlo
 	   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
============================================================
--- packages/busybox/busybox_1.01.bb	053a1b2673ae5244e90f71d2ad0aa48560f505d9
+++ packages/busybox/busybox_1.01.bb	d097d7782fd60adb5bfd5c2d8af0e1e39c5805dd
@@ -15,7 +15,7 @@ SRC_URI = "http://www.busybox.net/downlo
 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/downlo
 	   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}/