block.mk: Added ata-ixp4xx-cf module support for tw5334 board.

[openwrt.git] / package / busybox / Makefile

diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index eae037a..ab5e241 100644 (file)
--- a/package/busybox/Makefile
+++ b/package/busybox/Makefile
@@ -9,20 +9,20 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=busybox
-PKG_VERSION:=1.4.1
+PKG_VERSION:=1.8.2
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://www.busybox.net/downloads \
                http://distfiles.gentoo.org/distfiles/
-PKG_MD5SUM:=5728403bce309cdabcffa414e2e64052
-PKG_CAT:=bzcat
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_BUILD_DEPENDS:=libcgi
+PKG_MD5SUM:=5794c6187c7cc8176c52b96af9bf2478
 
 include $(INCLUDE_DIR)/package.mk
 
+ifeq ($(DUMP),)
+  STAMP_CONFIGURED:=$(strip $(STAMP_CONFIGURED))_$(shell grep '^CONFIG_BUSYBOX_' $(TOPDIR)/.config | md5s)
+endif
+
 init-y :=
 init-$(CONFIG_BUSYBOX_CONFIG_HTTPD) += httpd
 init-$(CONFIG_BUSYBOX_CONFIG_CROND) += cron
@@ -37,23 +37,25 @@ define Package/busybox
 endef
 
 define Package/busybox/description
-The Swiss Army Knife of embedded Linux.
-       It slices, it dices, it makes Julian Fries.
+ The Swiss Army Knife of embedded Linux.
+ It slices, it dices, it makes Julian Fries.
 endef
 
 define Package/busybox/config
-       source "$(SOURCE)/target-config.in"
        menu "Configuration"
                depends on PACKAGE_busybox
+               source "$(SOURCE)/target-config.in"
                source "$(SOURCE)/config/Config.in"
        endmenu
 endef
 
 define Build/Configure
-       $(SCRIPT_DIR)/gen_busybox_config.pl $(TOPDIR)/.config > $(PKG_BUILD_DIR)/.config
+       rm -f $(PKG_BUILD_DIR)/.configured*
+       grep 'CONFIG_BUSYBOX_' $(TOPDIR)/.config | sed -e "s,\\(# \)\\?CONFIG_BUSYBOX_\\(.*\\),\\1\\2,g" > $(PKG_BUILD_DIR)/.config
        yes '' | $(MAKE) -C $(PKG_BUILD_DIR) \
                CC="$(TARGET_CC)" \
                CROSS_COMPILE="$(TARGET_CROSS)" \
+               KBUILD_HAVE_NLS=no \
                ARCH="$(ARCH)" \
                oldconfig
 endef
@@ -62,22 +64,22 @@ define Build/Compile
        $(MAKE) -C $(PKG_BUILD_DIR) \
                CC="$(TARGET_CC)" \
                CROSS_COMPILE="$(TARGET_CROSS)" \
-               EXTRA_CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include" \
+               KBUILD_HAVE_NLS=no \
+               EXTRA_CFLAGS="$(TARGET_CFLAGS)" \
                ARCH="$(ARCH)" \
                IPKG_ARCH="$(ARCH)" \
-               EXTRA_LIBS="$(STAGING_DIR)/usr/lib/libcgi.a" \
                all
 endef
 
 define Package/busybox/install
+       $(FIND) $(PKG_BUILD_DIR) -lname "*busybox" -exec rm \{\} \;
        $(MAKE) -C $(PKG_BUILD_DIR) \
                CC="$(TARGET_CC)" \
                CROSS_COMPILE="$(TARGET_CROSS)" \
-               EXTRA_CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include" \
+               EXTRA_CFLAGS="$(TARGET_CFLAGS)" \
                ARCH="$(ARCH)" \
                IPKG_ARCH="$(ARCH)" \
                CONFIG_PREFIX="$(1)" \
-               EXTRA_LIBS="$(STAGING_DIR)/usr/lib/libcgi.a" \
                install
        $(INSTALL_DIR) $(1)/etc/init.d
        for tmp in $(init-y); do \