From 5684054ebba9d11c67f2b3cc30c8e4d58fcc19d9 Mon Sep 17 00:00:00 2001
From: Eric Andersen <andersen@codepoet.org>
Date: Sat, 31 Jan 2004 08:33:26 +0000
Subject: Update buildroot per the new snapshot situation with busybox. The old
 busybox 0.60.x series is no longer used/supported.  -Erik

---
 make/busybox.mk | 21 +++++----------------
 1 file changed, 5 insertions(+), 16 deletions(-)

(limited to 'make/busybox.mk')

diff --git a/make/busybox.mk b/make/busybox.mk
index 09eef6d1d..8cc631167 100644
--- a/make/busybox.mk
+++ b/make/busybox.mk
@@ -7,17 +7,15 @@
 ifeq ($(USE_BUSYBOX_SNAPSHOT),true)
 # Be aware that this changes daily....
 BUSYBOX_DIR:=$(BUILD_DIR)/busybox
-BUSYBOX_SOURCE=busybox-unstable.tar.bz2
+BUSYBOX_SOURCE=busybox-snapshot.tar.bz2
 BUSYBOX_SITE:=http://www.busybox.net/downloads/snapshots
-BUSYBOX_UNZIP=bzcat
-BUSYBOX_CONFIG:=$(SOURCE_DIR)/busybox.config
 else
-BUSYBOX_DIR:=$(BUILD_DIR)/busybox-0.60.5
-BUSYBOX_SOURCE:=busybox-0.60.5.tar.bz2
+BUSYBOX_DIR:=$(BUILD_DIR)/busybox-1.00-pre6
+BUSYBOX_SOURCE:=busybox-1.00-pre6.tar.bz2
 BUSYBOX_SITE:=http://www.busybox.net/downloads
-BUSYBOX_UNZIP=bzcat
-BUSYBOX_CONFIG:=$(SOURCE_DIR)/busybox.Config.h
 endif
+BUSYBOX_UNZIP=bzcat
+BUSYBOX_CONFIG:=$(SOURCE_DIR)/busybox.config
 
 $(DL_DIR)/$(BUSYBOX_SOURCE):
 	 $(WGET) -P $(DL_DIR) $(BUSYBOX_SITE)/$(BUSYBOX_SOURCE)
@@ -26,7 +24,6 @@ busybox-source: $(DL_DIR)/$(BUSYBOX_SOURCE) $(BUSYBOX_CONFIG)
 
 $(BUSYBOX_DIR)/.configured: $(DL_DIR)/$(BUSYBOX_SOURCE) $(BUSYBOX_CONFIG)
 	$(BUSYBOX_UNZIP) $(DL_DIR)/$(BUSYBOX_SOURCE) | tar -C $(BUILD_DIR) -xvf -
-ifeq ($(USE_BUSYBOX_SNAPSHOT),true)
 	cp $(BUSYBOX_CONFIG) $(BUSYBOX_DIR)/.config
 	$(SED) "s,^CROSS.*,CROSS=$(TARGET_CROSS)\n\
 		PREFIX=$(TARGET_DIR),;" $(BUSYBOX_DIR)/Rules.mak
@@ -36,14 +33,6 @@ else
 	$(SED) "s/^.*CONFIG_LFS.*/CONFIG_LFS=n/;" $(BUSYBOX_DIR)/.config
 endif
 	$(MAKE) CC=$(TARGET_CC) CROSS="$(TARGET_CROSS)" -C $(BUSYBOX_DIR) oldconfig
-else  # Not using snapshot
-	cp $(BUSYBOX_CONFIG) $(BUSYBOX_DIR)/Config.h
-	$(SED) "s,^CROSS.*,CROSS=$(TARGET_CROSS),;" $(BUSYBOX_DIR)/Makefile
-	$(SED) "s,^PREFIX.*,PREFIX=$(TARGET_DIR),;" $(BUSYBOX_DIR)/Makefile
-ifeq ($(strip $(BUILD_WITH_LARGEFILE)),true)
-	$(SED) "s/^DOLFS.*/DOLFS=true/;" $(BUSYBOX_DIR)/Makefile
-endif
-endif
 	touch $(BUSYBOX_DIR)/.configured
 
 busybox-unpack: $(BUSYBOX_DIR)/.configured
-- 
cgit v1.2.3