summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2006-11-17 11:21:23 +0000
committerBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2006-11-17 11:21:23 +0000
commit870cb9e826634f5a59e32866ec13c3e9869e594f (patch)
tree21a647a0bca4097c934187e6dbadf49228325550
parent2235df97347f72a008ba1bd7a743729d0ad75f0d (diff)
- check if busybox' Rules.mak exists.
- add target dirs to ensure that all required dirs do exist so make busybox-menuconfig works in a pristine checkout.
-rw-r--r--Makefile5
-rw-r--r--package/busybox/busybox.mk10
2 files changed, 9 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index 71d2ded46..0e21be0e6 100644
--- a/Makefile
+++ b/Makefile
@@ -75,9 +75,10 @@ TARGETS_CLEAN:=$(patsubst %,%-clean,$(TARGETS))
TARGETS_SOURCE:=$(patsubst %,%-source,$(TARGETS))
TARGETS_DIRCLEAN:=$(patsubst %,%-dirclean,$(TARGETS))
-world: $(DL_DIR) $(BUILD_DIR) $(STAGING_DIR) $(TARGET_DIR) $(TARGETS)
+dirs: $(DL_DIR) $(BUILD_DIR) $(STAGING_DIR)
+world: dirs $(TARGET_DIR) $(TARGETS)
-.PHONY: all world clean dirclean distclean source $(TARGETS) \
+.PHONY: all world dirs clean dirclean distclean source $(TARGETS) \
$(TARGETS_CLEAN) $(TARGETS_DIRCLEAN) $(TARGETS_SOURCE) \
$(DL_DIR) $(BUILD_DIR) $(TOOL_BUILD_DIR) $(STAGING_DIR)
diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index c0d7c62f4..7178a9b7f 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -23,7 +23,7 @@ BUSYBOX_CONFIG_FILE=$(subst ",, $(strip $(BR2_PACKAGE_BUSYBOX_CONFIG)))
$(DL_DIR)/$(BUSYBOX_SOURCE):
$(WGET) -P $(DL_DIR) $(BUSYBOX_SITE)/$(BUSYBOX_SOURCE)
-busybox-source: $(DL_DIR)/$(BUSYBOX_SOURCE) $(BUSYBOX_CONFIG_FILE) $(BUILD_DIR) host-sed
+busybox-source: $(DL_DIR)/$(BUSYBOX_SOURCE) $(BUSYBOX_CONFIG_FILE) dirs host-sed
$(BUSYBOX_DIR)/.unpacked: $(DL_DIR)/$(BUSYBOX_SOURCE)
$(BUSYBOX_UNZIP) $(DL_DIR)/$(BUSYBOX_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
@@ -37,8 +37,10 @@ endif
$(BUSYBOX_DIR)/.configured: $(BUSYBOX_DIR)/.unpacked $(BUSYBOX_CONFIG_FILE)
cp $(BUSYBOX_CONFIG_FILE) $(BUSYBOX_DIR)/.config
- $(SED) "s,^CROSS.*,CROSS=$(TARGET_CROSS)\n\
- PREFIX=$(TARGET_DIR),;" $(BUSYBOX_DIR)/Rules.mak
+ if [ -f $(BUSYBOX_DIR)/Rules.mak ]; then \
+ $(SED) "s,^CROSS.*,CROSS=$(TARGET_CROSS)\n\
+ PREFIX=$(TARGET_DIR),;" $(BUSYBOX_DIR)/Rules.mak ; \
+ fi
ifeq ($(BR2_LARGEFILE),y)
$(SED) "s/^.*CONFIG_LFS.*/CONFIG_LFS=y/;" $(BUSYBOX_DIR)/.config
else
@@ -64,7 +66,7 @@ endif
busybox: uclibc $(TARGET_DIR)/bin/busybox
-busybox-menuconfig: $(BUSYBOX_DIR)/.configured
+busybox-menuconfig: busybox-source $(BUSYBOX_DIR)/.configured
$(MAKE) __TARGET_ARCH=$(ARCH) -C $(BUSYBOX_DIR) menuconfig
busybox-clean: