diff options
| author | Raymond Danks <raymond@edanks.com> | 2006-05-31 22:04:31 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-05-31 22:04:31 +0000 |
| commit | 9352e538bb1842201e4bfe0d0e0c1804f0bbe995 (patch) | |
| tree | c5136e3cc61d0f18fd23387a955f1f3b34254cc7 /packages/busybox | |
| parent | c5a88975b700cabf384bd663e5c13d11f1c16558 (diff) | |
busybox - sh may not always be enabled in defconfig.
Diffstat (limited to 'packages/busybox')
| -rw-r--r-- | packages/busybox/busybox_1.00.bb | 2 | ||||
| -rw-r--r-- | packages/busybox/busybox_1.01.bb | 13 |
2 files changed, 7 insertions, 8 deletions
diff --git a/packages/busybox/busybox_1.00.bb b/packages/busybox/busybox_1.00.bb index 5b770669c1..c0f7c87a6b 100644 --- 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 1e2f41fcba..b642e8b21a 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,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}/ |