move diag from target/linux/package/ to package/.

[openwrt.git] / package / busybox / Makefile

diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index 3ada74532e925c863bf9b590b37a84d398ac962f..aac9d21e323aa292d3ada4396a7fafc24f7b056b 100644 (file)
--- a/package/busybox/Makefile
+++ b/package/busybox/Makefile
@@ -3,38 +3,42 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=busybox
+PKG_VERSION:=1.1.3
 PKG_RELEASE:=1
 
-PKG_VERSION:=1.1.2
 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
-TITLE:=Core utilities
-DESCRIPTION:=Core utilities for embedded Linux systems
+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.
+URL:=http://busybox.net/
+CONFIG:=\\\
+       menu "Configuration" \\\
+               depends on PACKAGE_busybox \\\
+               source "$(SOURCE)/config/Config.in" \\\
+       endmenu
 endef
-$(eval $(call BuildPackage,BUSYBOX,busybox))
 
-$(PKG_BUILD_DIR)/.configured:
+define Build/Configure
        $(SCRIPT_DIR)/gen_busybox_config.pl $(TOPDIR)/.config > $(PKG_BUILD_DIR)/.config
        yes '' | $(MAKE) CC=$(TARGET_CC) CROSS="$(TARGET_CROSS)" -C $(PKG_BUILD_DIR) oldconfig
-       touch $@
-
-$(PKG_BUILD_DIR)/.built:
-       $(MAKE) CC=$(TARGET_CC) CROSS="$(TARGET_CROSS)" PREFIX="$(IDIR_BUSYBOX)" \
-               EXTRA_CFLAGS="$(TARGET_CFLAGS)" ARCH="$(ARCH)" -C $(PKG_BUILD_DIR)
-       touch $@
+endef
 
-$(IPKG_BUSYBOX):
-       $(MAKE) CC=$(TARGET_CC) CROSS="$(TARGET_CROSS)" PREFIX="$(IDIR_BUSYBOX)" \
+define Package/busybox/install
+       $(MAKE) CC=$(TARGET_CC) CROSS="$(TARGET_CROSS)" PREFIX="$(1)" \
                EXTRA_CFLAGS="$(TARGET_CFLAGS)" -C $(PKG_BUILD_DIR) install
-       $(STRIP) $(IDIR_BUSYBOX)/bin/busybox
-       $(IPKG_BUILD) $(IDIR_BUSYBOX) $(PACKAGE_DIR)
+       -rm -rf $(1)/lib64
+endef
+
+$(eval $(call BuildPackage,busybox))