summaryrefslogtreecommitdiff
path: root/meta/packages/busybox/busybox_1.01.bb
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2006-11-21 10:02:56 +0000
committerRichard Purdie <richard@openedhand.com>2006-11-21 10:02:56 +0000
commit03c40cce7cf5c9791661544da396ab61e396ad8a (patch)
treea0a0a4e984152f1dac0d40ffb559441a5d605d84 /meta/packages/busybox/busybox_1.01.bb
parentdce65a1c29315c28044e7a50a1bd328b32cbcc6d (diff)
downloadopenembedded-core-03c40cce7cf5c9791661544da396ab61e396ad8a.tar.gz
openembedded-core-03c40cce7cf5c9791661544da396ab61e396ad8a.tar.bz2
openembedded-core-03c40cce7cf5c9791661544da396ab61e396ad8a.zip
busybox: Sync with OE.dev
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@902 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/busybox/busybox_1.01.bb')
-rw-r--r--meta/packages/busybox/busybox_1.01.bb8
1 files changed, 5 insertions, 3 deletions
diff --git a/meta/packages/busybox/busybox_1.01.bb b/meta/packages/busybox/busybox_1.01.bb
index 996b5418a4..9c8b7e60c3 100644
--- a/meta/packages/busybox/busybox_1.01.bb
+++ b/meta/packages/busybox/busybox_1.01.bb
@@ -10,7 +10,7 @@ HOMEPAGE = "http://www.busybox.net"
LICENSE = "GPL"
SECTION = "base"
PRIORITY = "required"
-PR = "r11"
+PR = "r12"
SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
file://udhcppidfile.patch;patch=1 \
@@ -28,8 +28,8 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
file://rmmod.patch;patch=1 \
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://glibc2.4-icmp6.patch;patch=1 \
file://defconfig \
file://busybox-cron \
file://busybox-httpd \
@@ -40,7 +40,9 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
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}"
@@ -85,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}/