summaryrefslogtreecommitdiffstats
path: root/make
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2002-10-23 07:56:48 +0000
committerEric Andersen <andersen@codepoet.org>2002-10-23 07:56:48 +0000
commit63db64a0ac4b4f8cb30f338fa6e8d6426b6210ef (patch)
tree2c48bafc1f92c744a2ee6aa63811579cfdd43b5e /make
parent6e3e6690ce26e65d665091403456c1b6ebbf397c (diff)
downloadbuildroot-novena-63db64a0ac4b4f8cb30f338fa6e8d6426b6210ef.tar.gz
buildroot-novena-63db64a0ac4b4f8cb30f338fa6e8d6426b6210ef.zip
Update things to be a tad more current
Diffstat (limited to 'make')
-rw-r--r--make/busybox.mk34
1 files changed, 18 insertions, 16 deletions
diff --git a/make/busybox.mk b/make/busybox.mk
index f12fa5bc7..a1fd04ca2 100644
--- a/make/busybox.mk
+++ b/make/busybox.mk
@@ -3,50 +3,52 @@
# busybox
#
#############################################################
+
ifeq ($(USE_BUSYBOX_SNAPSHOT),true)
# Be aware that this changes daily....
BUSYBOX_DIR:=$(BUILD_DIR)/busybox
BUSYBOX_SOURCE=busybox-snapshot.tar.bz2
BUSYBOX_SITE:=http://www.busybox.net/downloads/snapshots
BUSYBOX_UNZIP=bzcat
+BUSYBOX_PATCH:=$(SOURCE_DIR)/busybox.patch
else
-BUSYBOX_DIR:=$(BUILD_DIR)/busybox-0.60.3
-BUSYBOX_SOURCE:=busybox-0.60.3.tar.bz2
+BUSYBOX_DIR:=$(BUILD_DIR)/busybox-0.60.4
+BUSYBOX_SOURCE:=busybox-0.60.4.tar.bz2
BUSYBOX_SITE:=http://www.busybox.net/downloads
BUSYBOX_UNZIP=bzcat
-endif
BUSYBOX_PATCH:=$(SOURCE_DIR)/busybox.patch
-
+endif
$(DL_DIR)/$(BUSYBOX_SOURCE):
wget -P $(DL_DIR) --passive-ftp $(BUSYBOX_SITE)/$(BUSYBOX_SOURCE)
busybox-source: $(DL_DIR)/$(BUSYBOX_SOURCE) $(BUSYBOX_PATCH)
-$(BUSYBOX_DIR)/.unpacked: $(DL_DIR)/$(BUSYBOX_SOURCE) $(BUSYBOX_PATCH)
+$(BUSYBOX_DIR)/.configured: $(DL_DIR)/$(BUSYBOX_SOURCE) $(BUSYBOX_PATCH)
$(BUSYBOX_UNZIP) $(DL_DIR)/$(BUSYBOX_SOURCE) | tar -C $(BUILD_DIR) -xvf -
- touch $(BUSYBOX_DIR)/.unpacked
-
-$(BUSYBOX_DIR)/.patched: $(BUSYBOX_DIR)/.unpacked
- cat $(BUSYBOX_PATCH) | patch -d $(BUSYBOX_DIR) -p1
+ if [ -n "$(BUSYBOX_PATCH)" ] ; then \
+ cat $(BUSYBOX_PATCH) | patch -d $(BUSYBOX_DIR) -p1; fi
+ perl -i -p -e "s,^CROSS.*,CROSS=$(TARGET_CROSS),;" $(BUSYBOX_DIR)/Makefile
+ perl -i -p -e "s,^PREFIX.*,PREFIX=$(TARGET_DIR),;" $(BUSYBOX_DIR)/Makefile
+ perl -i -p -e "s/^MD5SUM_SIZE_VS_SPEED.*/MD5SUM_SIZE_VS_SPEED 0/;" $(BUSYBOX_DIR)/md5sum.c
ifeq ($(strip $(BUILD_WITH_LARGEFILE)),true)
perl -i -p -e "s/^DOLFS.*/DOLFS=true/;" $(BUSYBOX_DIR)/Makefile
endif
- touch $(BUSYBOX_DIR)/.patched
+ touch $(BUSYBOX_DIR)/.configured
+
+busybox-unpack: $(BUSYBOX_DIR)/.configured
-$(BUSYBOX_DIR)/busybox: $(BUSYBOX_DIR)/.patched
- make CROSS="$(TARGET_CROSS)" PREFIX="$(TARGET_DIR)" -C $(BUSYBOX_DIR)
- touch $(BUSYBOX_DIR)/busybox
+$(BUSYBOX_DIR)/busybox: $(BUSYBOX_DIR)/.configured
+ $(MAKE) CROSS="$(TARGET_CROSS)" PREFIX="$(TARGET_DIR)" -C $(BUSYBOX_DIR)
$(TARGET_DIR)/bin/busybox: $(BUSYBOX_DIR)/busybox
- make CROSS="$(TARGET_CROSS)" PREFIX="$(TARGET_DIR)" -C $(BUSYBOX_DIR) install
- cp -a $(BUSYBOX_DIR)/busybox $(TARGET_DIR)/bin/busybox
+ $(MAKE) CROSS="$(TARGET_CROSS)" PREFIX="$(TARGET_DIR)" -C $(BUSYBOX_DIR) install
busybox: uclibc $(TARGET_DIR)/bin/busybox
busybox-clean:
rm -f $(TARGET_DIR)/bin/busybox
- -make -C $(BUSYBOX_DIR) clean
+ -$(MAKE) -C $(BUSYBOX_DIR) clean
busybox-dirclean:
rm -rf $(BUSYBOX_DIR)