- 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.
This commit is contained in:
parent
2235df9734
commit
870cb9e826
5
Makefile
5
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)
|
||||
|
||||
|
@ -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:
|
||||
|
Loading…
Reference in New Issue
Block a user