summaryrefslogtreecommitdiff
path: root/make
diff options
context:
space:
mode:
authorManuel Novoa III <mjn3@codepoet.org>2004-03-05 19:12:02 +0000
committerManuel Novoa III <mjn3@codepoet.org>2004-03-05 19:12:02 +0000
commitfa12d4c6582906224f59f26915c46b2097d6088e (patch)
tree26979481a2bbcfab381b1f048aacbeb2189d3b83 /make
parenta7ac3d61c76ec86674444c6682af5d0c653aca77 (diff)
Update non-snapshot to pre8. Also pass TARGET_CFLAGS to the busybox
Makefile in the manner expected.
Diffstat (limited to 'make')
-rw-r--r--make/busybox.mk12
1 files changed, 7 insertions, 5 deletions
diff --git a/make/busybox.mk b/make/busybox.mk
index 659975bd0..4ad737ccd 100644
--- a/make/busybox.mk
+++ b/make/busybox.mk
@@ -7,11 +7,11 @@
ifeq ($(USE_BUSYBOX_SNAPSHOT),true)
# Be aware that this changes daily....
BUSYBOX_DIR:=$(BUILD_DIR)/busybox
-BUSYBOX_SOURCE=busybox-snapshot.tar.bz2
+BUSYBOX_SOURCE:=busybox-snapshot.tar.bz2
BUSYBOX_SITE:=http://www.busybox.net/downloads/snapshots
else
-BUSYBOX_DIR:=$(BUILD_DIR)/busybox-1.00-pre7
-BUSYBOX_SOURCE:=busybox-1.00-pre7.tar.bz2
+BUSYBOX_DIR:=$(BUILD_DIR)/busybox-1.00-pre8
+BUSYBOX_SOURCE:=busybox-1.00-pre8.tar.bz2
BUSYBOX_SITE:=http://www.busybox.net/downloads
endif
BUSYBOX_UNZIP=bzcat
@@ -24,6 +24,8 @@ 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 -
+ # Allow busybox patches.
+ $(SOURCE_DIR)/patch-kernel.sh $(BUSYBOX_DIR) $(SOURCE_DIR) busybox-*.patch
cp $(BUSYBOX_CONFIG) $(BUSYBOX_DIR)/.config
$(SED) "s,^CROSS.*,CROSS=$(TARGET_CROSS)\n\
PREFIX=$(TARGET_DIR),;" $(BUSYBOX_DIR)/Rules.mak
@@ -39,11 +41,11 @@ busybox-unpack: $(BUSYBOX_DIR)/.configured
$(BUSYBOX_DIR)/busybox: $(BUSYBOX_DIR)/.configured
$(MAKE) CC=$(TARGET_CC) CROSS="$(TARGET_CROSS)" PREFIX="$(TARGET_DIR)" \
- -C $(BUSYBOX_DIR)
+ EXTRA_CFLAGS="$(TARGET_CFLAGS)" -C $(BUSYBOX_DIR)
$(TARGET_DIR)/bin/busybox: $(BUSYBOX_DIR)/busybox
$(MAKE) CC=$(TARGET_CC) CROSS="$(TARGET_CROSS)" PREFIX="$(TARGET_DIR)" \
- -C $(BUSYBOX_DIR) install
+ EXTRA_CFLAGS="$(TARGET_CFLAGS)" -C $(BUSYBOX_DIR) install
# Just in case
-chmod a+x $(TARGET_DIR)/usr/share/udhcpc/default.script