X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/c4b73fa154ce47702ee9b3bbe621d8f079eb7fa5..acd42a61cfdf83d6354f3a90cce4068f6567ae17:/package/busybox/Makefile

diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index 7c7bd3adf..0b4e3d456 100644
--- a/package/busybox/Makefile
+++ b/package/busybox/Makefile
@@ -1,21 +1,20 @@
 # 
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=busybox
-PKG_VERSION:=1.4.2
-PKG_RELEASE:=3
+PKG_VERSION:=1.11.3
+PKG_RELEASE:=5
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://www.busybox.net/downloads \
 		http://distfiles.gentoo.org/distfiles/
-PKG_MD5SUM:=b4c61fb15642be9dde20e8493788c585
+PKG_MD5SUM:=4355ad8bb57ce3b39ad827566c1a6da3
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -42,9 +41,9 @@ define Package/busybox/description
 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
@@ -55,6 +54,7 @@ define Build/Configure
 	yes '' | $(MAKE) -C $(PKG_BUILD_DIR) \
 		CC="$(TARGET_CC)" \
 		CROSS_COMPILE="$(TARGET_CROSS)" \
+		KBUILD_HAVE_NLS=no \
 		ARCH="$(ARCH)" \
 		oldconfig
 endef
@@ -63,23 +63,25 @@ define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		CC="$(TARGET_CC)" \
 		CROSS_COMPILE="$(TARGET_CROSS)" \
+		KBUILD_HAVE_NLS=no \
 		EXTRA_CFLAGS="$(TARGET_CFLAGS)" \
 		ARCH="$(ARCH)" \
-		IPKG_ARCH="$(ARCH)" \
 		all
-endef
-
-define Package/busybox/install
-	find $(PKG_BUILD_DIR) -lname "*busybox" -exec rm \{\} \;
+	rm -rf $(PKG_INSTALL_DIR)
+	$(FIND) $(PKG_BUILD_DIR) -lname "*busybox" -exec rm \{\} \;
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		CC="$(TARGET_CC)" \
 		CROSS_COMPILE="$(TARGET_CROSS)" \
 		EXTRA_CFLAGS="$(TARGET_CFLAGS)" \
 		ARCH="$(ARCH)" \
 		IPKG_ARCH="$(ARCH)" \
-		CONFIG_PREFIX="$(1)" \
+		CONFIG_PREFIX="$(PKG_INSTALL_DIR)" \
 		install
+endef
+
+define Package/busybox/install
 	$(INSTALL_DIR) $(1)/etc/init.d
+	$(CP) $(PKG_INSTALL_DIR)/* $(1)/
 	for tmp in $(init-y); do \
 		$(INSTALL_BIN) ./files/$$$$tmp $(1)/etc/init.d/$$$$tmp; \
 	done