X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/271fe72913eccc9a113c3fc3320cb5144be4871c..425fe905bf207fe5ba5d9d31c9ec0a05714d128f:/package/busybox/Makefile?ds=sidebyside

diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index 3430a217f..9abbe348a 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.7.2
-PKG_RELEASE:=4
+PKG_VERSION:=1.13.4
+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:=c91ec9756e2000073a9dd8fa9fc3f89e
+PKG_MD5SUM:=8a5eb7f15d4077d18fa97bda7a4e5412
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -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