sync busybox with trunk (update to v1.1.3).

[openwrt-10.03/.git] / package / busybox / Makefile

diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index a5830764e5fc17b80315227570db3df0a6cf4848..799372fad341d9f7a320c3a2f0222bf1207807a1 100644 (file)
--- a/package/busybox/Makefile
+++ b/package/busybox/Makefile
@@ -3,25 +3,31 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=busybox
-PKG_VERSION:=1.1.2
+PKG_VERSION:=1.1.3
 PKG_RELEASE:=1
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://www.busybox.net/downloads
-PKG_MD5SUM:=0b5d78072302fe687407956537bdb9e3
+PKG_MD5SUM:=19a0b475169335f17e421cf644616fe7
 PKG_CAT:=bzcat
 
 include $(TOPDIR)/package/rules.mk
 
 define Package/busybox
-CONFIGFILE:=config/Config.in
 SECTION:=base
 CATEGORY:=Base system
+MENU:=1
+DEFAULT:=y
 TITLE:=Core utilities for embedded Linux
-DESCRIPTION:=The Swiss Army Knife of embedded Linux.  It slices, it dices, it\\\
-makes Julian Fries.
+DESCRIPTION:=The Swiss Army Knife of embedded Linux. \\\
+It slices, it dices, it makes Julian Fries.
 URL:=http://busybox.net/
+CONFIG:=\\\
+       menu "Configuration" \\\
+               depends on PACKAGE_busybox \\\
+               source "$(SOURCE)/config/Config.in" \\\
+       endmenu
 endef
 
 define Build/Configure
@@ -29,19 +35,9 @@ define Build/Configure
        yes '' | $(MAKE) CC=$(TARGET_CC) CROSS="$(TARGET_CROSS)" -C $(PKG_BUILD_DIR) oldconfig
 endef
 
-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               CC=$(TARGET_CC) \
-               CROSS="$(TARGET_CROSS)" \
-               PREFIX="$(IDIR_BUSYBOX)" \
-               EXTRA_CFLAGS="$(TARGET_CFLAGS)" \
-               ARCH="$(ARCH)" 
-endef
-
 define Package/busybox/install
        $(MAKE) CC=$(TARGET_CC) CROSS="$(TARGET_CROSS)" PREFIX="$(1)" \
                EXTRA_CFLAGS="$(TARGET_CFLAGS)" -C $(PKG_BUILD_DIR) install
-       $(STRIP) $(1)/bin/busybox
 endef
 
 $(eval $(call BuildPackage,busybox))