X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=package%2Fbusybox%2FMakefile;h=799372fad341d9f7a320c3a2f0222bf1207807a1;hb=cd0d52cbccd8c66fd7b28a35eb69efdc4231201f;hp=35f954b931ef5e309653718d03ef31f4bdad056a;hpb=b3e2848f833b397019a149ae3c056bc725f66b61;p=openwrt-10.03%2F.git

diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index 35f954b93..799372fad 100644
--- a/package/busybox/Makefile
+++ b/package/busybox/Makefile
@@ -3,40 +3,41 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=busybox
+PKG_VERSION:=1.1.3
 PKG_RELEASE:=1
 
-ifeq ($(strip $(BR2_PACKAGE_BUSYBOX_SNAPSHOT)),y)
-# Be aware that this changes daily....
-PKG_VERSION:=0.${shell date +"%G%m%d"}
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
-PKG_SOURCE:=$(PKG_NAME)-snapshot.tar.bz2
-PKG_SOURCE_URL:=http://www.busybox.net/downloads/snapshots
-PKG_MD5SUM:=x
-else
-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
-endif
+PKG_MD5SUM:=19a0b475169335f17e421cf644616fe7
 PKG_CAT:=bzcat
 
 include $(TOPDIR)/package/rules.mk
 
-$(eval $(call PKG_template,BUSYBOX,$(PKG_NAME),$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-
-$(PKG_BUILD_DIR)/.configured:
+define Package/busybox
+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.
+URL:=http://busybox.net/
+CONFIG:=\\\
+	menu "Configuration" \\\
+		depends on PACKAGE_busybox \\\
+		source "$(SOURCE)/config/Config.in" \\\
+	endmenu
+endef
+
+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)
+endef
+
+$(eval $(call BuildPackage,busybox))