X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fstaging%2Fchunkeey.git;a=blobdiff_plain;f=Makefile;h=09db75c5508d49d1bc10f66007149136ca0bcf7c;hp=51ed5a1132e358c2fade97b93f1ab38c1608e9de;hb=b4be4617b5f33b47a5eb00756f939a23cf368145;hpb=7a315b0b5d6aa91695853a8647383876e4b49a7a diff --git a/Makefile b/Makefile index 51ed5a1132..09db75c550 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,7 @@ $(if $(findstring $(space),$(TOPDIR)),$(error ERROR: The path to the LEDE direct world: -include $(TOPDIR)/include/host.mk +export PATH:=$(TOPDIR)/staging_dir/host/bin:$(PATH) ifneq ($(OPENWRT_BUILD),1) _SINGLE=export MAKEFLAGS=$(space); @@ -39,8 +39,8 @@ else include tools/Makefile include toolchain/Makefile -$(toolchain/stamp-install): $(tools/stamp-install) -$(target/stamp-compile): $(toolchain/stamp-install) $(tools/stamp-install) $(BUILD_DIR)/.prepared +$(toolchain/stamp-compile): $(tools/stamp-compile) +$(target/stamp-compile): $(toolchain/stamp-compile) $(tools/stamp-compile) $(BUILD_DIR)/.prepared $(package/stamp-compile): $(target/stamp-compile) $(package/stamp-cleanup) $(package/stamp-install): $(package/stamp-compile) $(target/stamp-install): $(package/stamp-compile) $(package/stamp-install) @@ -55,7 +55,7 @@ clean: FORCE rm -rf $(BUILD_DIR) $(STAGING_DIR) $(BIN_DIR) $(OUTPUT_DIR)/packages/$(ARCH_PACKAGES) $(BUILD_LOG_DIR) $(TOPDIR)/staging_dir/packages dirclean: clean - rm -rf $(STAGING_DIR_HOST) $(TOOLCHAIN_DIR) $(BUILD_DIR_HOST) $(BUILD_DIR_TOOLCHAIN) + rm -rf $(STAGING_DIR_HOST) $(STAGING_DIR_HOSTPKG) $(TOOLCHAIN_DIR) $(BUILD_DIR_BASE)/host $(BUILD_DIR_BASE)/hostpkg $(BUILD_DIR_TOOLCHAIN) rm -rf $(TMP_DIR) ifndef DUMP_TARGET_DB @@ -87,7 +87,13 @@ prereq: $(target/stamp-prereq) tmp/.prereq_packages checksum: FORCE $(call sha256sums,$(BIN_DIR)) -prepare: .config $(tools/stamp-install) $(toolchain/stamp-install) +diffconfig: FORCE + mkdir -p $(BIN_DIR) + $(SCRIPT_DIR)/diffconfig.sh > $(BIN_DIR)/config.seed + +prepare: .config $(tools/stamp-compile) $(toolchain/stamp-compile) + $(_SINGLE)$(SUBMAKE) -r diffconfig + world: prepare $(target/stamp-compile) $(package/stamp-compile) $(package/stamp-install) $(target/stamp-install) FORCE $(_SINGLE)$(SUBMAKE) -r package/index $(_SINGLE)$(SUBMAKE) -r checksum