X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/1b182cdd5131faaf3c66615b93712fb8bd837089..69cdd2998607697bdf28064fe965bbec9c781372:/package/busybox/Makefile

diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index 907a848d1..31ec10351 100644
--- a/package/busybox/Makefile
+++ b/package/busybox/Makefile
@@ -1,43 +1,50 @@
+# 
+# Copyright (C) 2006 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_RELEASE:=2
-
-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.00
+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:=5c7ea9b5d3b3677dfcdcec38b281a756
-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:
+include $(INCLUDE_DIR)/package.mk
+
+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 $@
+endef
 
-$(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 $@
-
-$(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
-	-chmod a+x $(IDIR_BUSYBOX)/usr/share/udhcpc/default.script
-	$(IPKG_BUILD) $(IDIR_BUSYBOX) $(PACKAGE_DIR)
+	-rm -rf $(1)/lib64
+endef
+
+$(eval $(call BuildPackage,busybox))