diff --git a/Makefile b/Makefile index 099edf842..053a0f1cd 100644 --- a/Makefile +++ b/Makefile @@ -41,7 +41,7 @@ USE_UCLIBC_SNAPSHOT:=true # Enable this to use the busybox daily snapshot instead of a released # version. Daily snapshots may contain new features and bugfixes. Or # they may not even compile at all.... -USE_BUSYBOX_SNAPSHOT:=true +USE_BUSYBOX_SNAPSHOT:=false # Enable large file (files > 2 GB) support BUILD_WITH_LARGEFILE:=false diff --git a/make/busybox.mk b/make/busybox.mk index 1af0f852f..36c0c41fc 100644 --- a/make/busybox.mk +++ b/make/busybox.mk @@ -8,12 +8,12 @@ ifeq ($(USE_BUSYBOX_SNAPSHOT),true) BUSYBOX_DIR:=$(BUILD_DIR)/busybox BUSYBOX_SOURCE=busybox-snapshot.tar.bz2 BUSYBOX_SITE:=http://www.busybox.net/downloads/snapshots -UNZIP=bzcat +BUSYBOX_UNZIP=bzcat else -BUSYBOX_DIR:=$(BUILD_DIR)/busybox-0.60.2 -BUSYBOX_SOURCE:=busybox-0.60.2.tar.gz +BUSYBOX_DIR:=$(BUILD_DIR)/busybox-0.60.3 +BUSYBOX_SOURCE:=busybox-0.60.3.tar.bz2 BUSYBOX_SITE:=http://www.busybox.net/downloads -UNZIP=zcat +BUSYBOX_UNZIP=bzcat endif BUSYBOX_PATCH:=$(SOURCE_DIR)/busybox.patch @@ -24,7 +24,7 @@ $(DL_DIR)/$(BUSYBOX_SOURCE): busybox-source: $(DL_DIR)/$(BUSYBOX_SOURCE) $(BUSYBOX_PATCH) $(BUSYBOX_DIR)/Config.h: $(DL_DIR)/$(BUSYBOX_SOURCE) $(BUSYBOX_PATCH) - $(UNZIP) $(DL_DIR)/$(BUSYBOX_SOURCE) | tar -C $(BUILD_DIR) -xvf - + $(BUSYBOX_UNZIP) $(DL_DIR)/$(BUSYBOX_SOURCE) | tar -C $(BUILD_DIR) -xvf - cat $(BUSYBOX_PATCH) | patch -d $(BUSYBOX_DIR) -p1 ifeq ($(strip $(BUILD_WITH_LARGEFILE)),true) perl -i -p -e "s/^DOLFS.*/DOLFS=true/;" $(BUSYBOX_DIR)/Makefile