diff options
author | Michael Lauer <mickey@vanille-media.de> | 2006-07-06 17:07:53 +0000 |
---|---|---|
committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-07-06 17:07:53 +0000 |
commit | e1d38e518ea95c1259ad5ac2e0fc9bb1ee764c86 (patch) | |
tree | 2eab9b935e9fce3d14ce24cad32bdb09a1f3aaa8 /packages/busybox/busybox_1.2.0.bb | |
parent | 69a036d33297839393fb3949f56de23f5ab97b34 (diff) | |
download | openembedded-e1d38e518ea95c1259ad5ac2e0fc9bb1ee764c86.tar.gz |
busybox 1.2.0 fix packaging due to changed CONFIG_ options
WARNING: Need to review ALL defconfigs before setting this version as default
Diffstat (limited to 'packages/busybox/busybox_1.2.0.bb')
-rw-r--r-- | packages/busybox/busybox_1.2.0.bb | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/packages/busybox/busybox_1.2.0.bb b/packages/busybox/busybox_1.2.0.bb index 798998c8e1..f386304d90 100644 --- a/packages/busybox/busybox_1.2.0.bb +++ b/packages/busybox/busybox_1.2.0.bb @@ -35,8 +35,7 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ file://syslog.conf \ file://mount.busybox \ file://umount.busybox" - -#S = "${WORKDIR}/busybox-1.1.0-pre1" +S = "${WORKDIR}/busybox-1.2.0" export EXTRA_CFLAGS = "${CFLAGS}" EXTRA_OEMAKE_append = " CROSS=${HOST_PREFIX}" @@ -101,7 +100,7 @@ do_install () { install -m 0755 ${WORKDIR}/busybox-httpd ${D}${sysconfdir}/init.d/ install -d ${D}/srv/www fi - if grep "CONFIG_UDHCPD=y" ${WORKDIR}/defconfig; then + if grep "CONFIG_APP_UDHCPD=y" ${WORKDIR}/defconfig; then # Move udhcpd back to /usr/sbin/udhcpd install -d ${D}${sbindir} mv ${D}/busybox${sbindir}/udhcpd ${D}${sbindir}/ @@ -115,7 +114,7 @@ do_install () { install -m 0755 ${WORKDIR}/hwclock.sh ${D}${sysconfdir}/init.d/ fi - if grep "CONFIG_UDHCPC=y" ${WORKDIR}/defconfig; then + if grep "CONFIG_APP_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}/ |