diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2015-09-10 11:06:42 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2015-09-10 11:06:42 +0000 |
| commit | add0c00c96223adeeec37372504f84ed88e06d46 (patch) | |
| tree | c979059d54df21ac2219b798306c4bee0964efcb | |
| parent | 82fb27917b9cf62f3c9f0ad1bc7db0e83c5eccbc (diff) | |
| download | upstream-add0c00c96223adeeec37372504f84ed88e06d46.tar.gz upstream-add0c00c96223adeeec37372504f84ed88e06d46.tar.bz2 upstream-add0c00c96223adeeec37372504f84ed88e06d46.zip | |
imagebuilder: run build prereq checks before building image to set up host commands properly
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 46840
| -rw-r--r-- | target/imagebuilder/files/Makefile | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/target/imagebuilder/files/Makefile b/target/imagebuilder/files/Makefile index 8f25c4a12f..479fa0e850 100644 --- a/target/imagebuilder/files/Makefile +++ b/target/imagebuilder/files/Makefile @@ -85,6 +85,21 @@ endef include $(INCLUDE_DIR)/target.mk +staging_dir/host/.prereq-build: include/prereq-build.mk + mkdir -p tmp + rm -f tmp/.host.mk + @$(_SINGLE)$(NO_TRACE_MAKE) -j1 -r -s -f $(TOPDIR)/include/prereq-build.mk prereq 2>/dev/null || { \ + echo "Prerequisite check failed. Use FORCE=1 to override."; \ + false; \ + } + ifneq ($(realpath $(TOPDIR)/include/prepare.mk),) + @$(_SINGLE)$(NO_TRACE_MAKE) -j1 -r -s -f $(TOPDIR)/include/prepare.mk prepare 2>/dev/null || { \ + echo "Preparation failed."; \ + false; \ + } + endif + touch $@ + _call_info: FORCE echo 'Current Target: "$(BOARD)$(if $(SUBTARGET), ($(BOARDNAME)))"' echo 'Default Packages: $(DEFAULT_PACKAGES)' @@ -96,7 +111,7 @@ BUILD_PACKAGES:=$(sort $(DEFAULT_PACKAGES) $(USER_PACKAGES) $($(USER_PROFILE)_PA BUILD_PACKAGES:=$(filter-out $(filter -%,$(BUILD_PACKAGES)) $(patsubst -%,%,$(filter -%,$(BUILD_PACKAGES))),$(BUILD_PACKAGES)) PACKAGES:= -_call_image: +_call_image: staging_dir/host/.prereq-build echo 'Building images for $(BOARD)$(if $($(USER_PROFILE)_NAME), - $($(USER_PROFILE)_NAME))' echo 'Packages: $(BUILD_PACKAGES)' echo |