busybox - sh may not always be enabled in defconfig.

diff --git a/packages/busybox/busybox_1.00.bb b/packages/busybox/busybox_1.00.bb
index 5b77066..c0f7c87 100644 (file)
--- a/packages/busybox/busybox_1.00.bb
+++ b/packages/busybox/busybox_1.00.bb
@@ -83,7 +83,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 -f ${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}/

diff --git a/packages/busybox/busybox_1.01.bb b/packages/busybox/busybox_1.01.bb
index 1e2f41f..b642e8b 100644 (file)
--- 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,14 +29,13 @@ 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 \
@@ -86,7 +85,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 -f ${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}/