summaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authorBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2007-01-19 14:17:34 +0000
committerBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2007-01-19 14:17:34 +0000
commitf6c0fd635adba268e2c23c7a3aeb8734d31f8a58 (patch)
tree739116d335f2af0cfa935b5b9c515d1d1351c348 /package
parentb796ecae8fb4b8b5cef5e5bb535a561e28d0c815 (diff)
downloadbuildroot-novena-f6c0fd635adba268e2c23c7a3aeb8734d31f8a58.tar.gz
buildroot-novena-f6c0fd635adba268e2c23c7a3aeb8734d31f8a58.zip
- copy the _CONFIG_FILES back
- use the BUSYBOX_CONFIG_FILE if specified by the user
Diffstat (limited to 'package')
-rw-r--r--package/busybox/busybox.mk5
1 files changed, 4 insertions, 1 deletions
diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index c06482e31..583cd3ebb 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -34,8 +34,10 @@ endif
BUSYBOX_UNZIP=$(BZCAT)
+ifndef BUSYBOX_CONFIG_FILE
BUSYBOX_CONFIG_FILE=$(subst ",, $(strip $(BR2_PACKAGE_BUSYBOX_CONFIG)))
#")
+endif
$(DL_DIR)/$(BUSYBOX_SOURCE):
$(WGET) -P $(DL_DIR) $(BUSYBOX_SITE)/$(BUSYBOX_SOURCE)
@@ -53,7 +55,7 @@ endif
touch $(BUSYBOX_DIR)/.unpacked
$(BUSYBOX_DIR)/.configured: $(BUSYBOX_DIR)/.unpacked $(BUSYBOX_CONFIG_FILE)
- cp $(BUSYBOX_CONFIG_FILE) $(BUSYBOX_DIR)/.config
+ cp -f $(BUSYBOX_CONFIG_FILE) $(BUSYBOX_DIR)/.config
ifeq ($(strip $(BR2_BUSYBOX_VERSION_1_0_1)),y)
$(SED) "s,^CROSS.*,CROSS=$(TARGET_CROSS)\n\PREFIX=$(TARGET_DIR),;" \
$(BUSYBOX_DIR)/Rules.mak ;
@@ -111,6 +113,7 @@ busybox: uclibc $(TARGET_DIR)/bin/busybox
busybox-menuconfig: busybox-source $(BUSYBOX_DIR)/.configured
$(MAKE) __TARGET_ARCH=$(ARCH) -C $(BUSYBOX_DIR) menuconfig
+ cp -f $(BUSYBOX_DIR)/.config $(BUSYBOX_CONFIG_FILE)
busybox-clean:
rm -f $(TARGET_DIR)/bin/busybox