From e4f913c9c84fe92b8aba68dd5507daeb136b269b Mon Sep 17 00:00:00 2001
From: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
Date: Sun, 23 Jan 2011 20:59:26 +0100
Subject: Packages: busybox: use download/decompress macros

Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
---
 packages/busybox/busybox.kconfig | 14 ++++++++++++++
 packages/busybox/busybox.mk      | 14 +++++++-------
 2 files changed, 21 insertions(+), 7 deletions(-)

(limited to 'packages/busybox')

diff --git a/packages/busybox/busybox.kconfig b/packages/busybox/busybox.kconfig
index 78a9b51..7548bb0 100644
--- a/packages/busybox/busybox.kconfig
+++ b/packages/busybox/busybox.kconfig
@@ -31,14 +31,19 @@ choice
 
 	config EMBTK_BB_VERSION_1_17_X
 		bool "busybox-1.17.x"
+		select EMBTK_BB_PKG_IS_TARBZ2
 	config EMBTK_BB_VERSION_1_16_X
 		bool "busybox-1.16.x"
+		select EMBTK_BB_PKG_IS_TARBZ2
 	config EMBTK_BB_VERSION_1_15_X
 		bool "busybox-1.15.x"
+		select EMBTK_BB_PKG_IS_TARBZ2
 	config EMBTK_BB_VERSION_1_14_X
 		bool "busybox-1.14.x"
+		select EMBTK_BB_PKG_IS_TARBZ2
 	config EMBTK_BB_VERSION_1_13_X
 		bool "busybox-1.13.x"
+		select EMBTK_BB_PKG_IS_TARBZ2
 endchoice
 
 choice
@@ -103,4 +108,13 @@ config EMBTK_BB_VERSION_STRING
 	default "1.14.1"	if EMBTK_BB_VERSION_1_14_1
 	default "1.13.4"	if EMBTK_BB_VERSION_1_13_4
 
+config EMBTK_BB_NEED_PATCH
+	bool
+config EMBTK_BB_NEED_AUTORECONF
+	bool
+config EMBTK_BB_PKG_IS_TARGZ
+	bool
+config EMBTK_BB_PKG_IS_TARBZ2
+	bool
+
 source packages/busybox/busybox-kconfigs/busybox.kconfig
diff --git a/packages/busybox/busybox.mk b/packages/busybox/busybox.mk
index 5c06a48..52ec31b 100644
--- a/packages/busybox/busybox.mk
+++ b/packages/busybox/busybox.mk
@@ -23,10 +23,13 @@
 # \date         May 2009
 ################################################################################
 
-BB_VERSION := $(subst ",,$(strip $(CONFIG_EMBTK_BB_VERSION_STRING)))
-BB_DOT_CONFIG := $(subst ",,$(strip $(CONFIG_EMBTK_BB_DOT_CONFIG)))
+BB_NAME := busybox
+BB_VERSION := $(call EMBTK_GET_PKG_VERSION,BB)
 BB_SITE := http://www.busybox.net/downloads
+BB_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
+BB_PATCH_SITE := ftp://ftp.embtoolkit.org/embtoolkit.org/busybox/$(BB_VERSION)
 BB_PACKAGE := busybox-$(BB_VERSION).tar.bz2
+BB_SRC_DIR := $(PACKAGES_BUILD)/busybox-$(BB_VERSION)
 BB_BUILD_DIR := $(PACKAGES_BUILD)/busybox-$(BB_VERSION)
 
 busybox_install: $(BB_BUILD_DIR)/.installed
@@ -45,13 +48,10 @@ $(BB_BUILD_DIR)/.installed: download_busybox $(BB_BUILD_DIR)/.decompressed \
 	@touch $@
 
 download_busybox:
-	@test -e $(DOWNLOAD_DIR)/$(BB_PACKAGE) || \
-	wget -O $(DOWNLOAD_DIR)/$(BB_PACKAGE) $(BB_SITE)/$(BB_PACKAGE)
+	$(call EMBTK_DOWNLOAD_PKG,BB)
 
 $(BB_BUILD_DIR)/.decompressed:
-	$(call EMBTK_GENERIC_MESSAGE,"Decompressing $(BB_PACKAGE) ...")
-	@tar -C $(PACKAGES_BUILD) -xjf $(DOWNLOAD_DIR)/$(BB_PACKAGE)
-	@touch $@
+	$(call EMBTK_DECOMPRESS_PKG,BB)
 
 $(BB_BUILD_DIR)/.configured:
 	$(call EMBTK_GENERIC_MESSAGE,"Configuring busybox...")
-- 
cgit v1.2.3