summaryrefslogtreecommitdiff
path: root/meta/packages/busybox/busybox.inc
diff options
context:
space:
mode:
authorKevin Tian <kevin.tian@intel.com>2010-07-06 15:33:31 +0800
committerJoshua Lock <josh@linux.intel.com>2010-07-07 17:12:11 +0100
commitb56df3f573bdd5b5aebb5bdf565e8d9be1aa098d (patch)
treee3ad39ad14f6eb1f941445d35e7650113808e1bc /meta/packages/busybox/busybox.inc
parent330e32da127715341f49780b1f88120a31411739 (diff)
downloadopenembedded-core-b56df3f573bdd5b5aebb5bdf565e8d9be1aa098d.tar.gz
openembedded-core-b56df3f573bdd5b5aebb5bdf565e8d9be1aa098d.tar.bz2
openembedded-core-b56df3f573bdd5b5aebb5bdf565e8d9be1aa098d.zip
busybox: upgrade to 1.16.2
[Patches] (add comments for kept patches) REMOVE _0000-wget-no-check-certificate.patch_: in 1.16.2 now KEEP _B921600.patch_: add 921600 speed serial line REMOVE _ash_fix_redirection_of_fd_0.patch_: in 1.16.2 REMOVE _fdisk_lineedit_segfault.patch_: not used even in 1.15.3 REMOVE _fix_: not used even in 1.15.3 KEEP _get_header_tar.patch_: fix tar problem with exact 100 bytes filename REMOVE _r24785.patch_: not used even in 1.15.3 KEEP _run-parts.in.usr-bin.patch_: solve confliction with debianutils. Though the later is not in poky, keep it for safety KEEP _udhcpscript.patch_: fix warning message REMOVE _xargs-double-size.patch_: not used even in 1.15.3 KEEP _busybox-appletlib-dependency.patch_: solve paralle make issue. Move away from files/. KEEP _udhcpc-fix-nfsroot.patch_: support nfsroot [Files] UPDATE _defconfig_: adapt to new 1.16.2 config options [Recipe] - adapt to new 1.16.2 config option - remove old OEMAKE_apend on "CROSS" which has been replaced by "CROSS_COMPILE" since 2006 Signed-off-by Kevin Tian <kevin.tian@intel.com>
Diffstat (limited to 'meta/packages/busybox/busybox.inc')
-rw-r--r--meta/packages/busybox/busybox.inc5
1 files changed, 2 insertions, 3 deletions
diff --git a/meta/packages/busybox/busybox.inc b/meta/packages/busybox/busybox.inc
index 9f450532da..8c258135c8 100644
--- a/meta/packages/busybox/busybox.inc
+++ b/meta/packages/busybox/busybox.inc
@@ -7,7 +7,6 @@ SECTION = "base"
PRIORITY = "required"
export EXTRA_CFLAGS = "${CFLAGS}"
-EXTRA_OEMAKE_append = " CROSS=${HOST_PREFIX}"
PACKAGES =+ "${PN}-httpd ${PN}-udhcpd"
FILES_${PN}-httpd = "${sysconfdir}/init.d/busybox-httpd /srv/www"
@@ -70,7 +69,7 @@ do_install () {
install -m 0755 ${WORKDIR}/busybox-httpd ${D}${sysconfdir}/init.d/
install -d ${D}/srv/www
fi
- if grep "CONFIG_APP_UDHCPD=y" ${WORKDIR}/defconfig; then
+ if grep "CONFIG_UDHCPD=y" ${WORKDIR}/defconfig; then
# Move udhcpd back to /usr/sbin/udhcpd
install -d ${D}${sbindir}
mv ${D}/busybox${sbindir}/udhcpd ${D}${sbindir}/
@@ -84,7 +83,7 @@ do_install () {
install -m 0755 ${WORKDIR}/hwclock.sh ${D}${sysconfdir}/init.d/
fi
- if grep "CONFIG_APP_UDHCPC=y" ${WORKDIR}/defconfig; then
+ if grep "CONFIG_UDHCPC=y" ${WORKDIR}/defconfig; then
# Move dhcpc back to /usr/sbin/udhcpc
install -d ${D}${base_sbindir}
mv ${D}/busybox${base_sbindir}/udhcpc ${D}${base_sbindir}/