From b4a6c333c073520b05542c6b78a1f81f5a8b6c62 Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Fri, 14 Apr 2006 01:22:55 +0000
Subject: remove some more stuff, change package makefile format in rules.mk,
 port busybox over to the new format

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@3643 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/busybox/Makefile             | 18 ++++++++----------
 package/busybox/ipkg/busybox.control |  4 ----
 2 files changed, 8 insertions(+), 14 deletions(-)
 delete mode 100644 package/busybox/ipkg/busybox.control

(limited to 'package/busybox')

diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index 35f954b93..3ada74532 100644
--- a/package/busybox/Makefile
+++ b/package/busybox/Makefile
@@ -5,25 +5,23 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=busybox
 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_CAT:=bzcat
 
 include $(TOPDIR)/package/rules.mk
 
-$(eval $(call PKG_template,BUSYBOX,$(PKG_NAME),$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+define Package/busybox
+CONFIGFILE:=config/Config.in
+SECTION:=base
+CATEGORY:=Base system
+TITLE:=Core utilities
+DESCRIPTION:=Core utilities for embedded Linux systems
+endef
+$(eval $(call BuildPackage,BUSYBOX,busybox))
 
 $(PKG_BUILD_DIR)/.configured:
 	$(SCRIPT_DIR)/gen_busybox_config.pl $(TOPDIR)/.config > $(PKG_BUILD_DIR)/.config
diff --git a/package/busybox/ipkg/busybox.control b/package/busybox/ipkg/busybox.control
deleted file mode 100644
index e7fc84a29..000000000
--- a/package/busybox/ipkg/busybox.control
+++ /dev/null
@@ -1,4 +0,0 @@
-Package: busybox
-Priority: optional
-Section: net
-Description: Core utilities for embedded Linux systems
-- 
cgit v1.2.3