From 53aef8417d5b9e00e4b74b022ed03975c732d8e9 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Wed, 10 Jan 2007 21:52:28 +0000 Subject: Add initial version of the new Image Builder It's still a bit rough in a few places, but it seems to work for Broadcom at least - other targets untested. git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6071 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/image.mk | 23 ++++++++++++++++++++--- include/target.mk | 5 +++++ 2 files changed, 25 insertions(+), 3 deletions(-) (limited to 'include') diff --git a/include/image.mk b/include/image.mk index 702434ec86..4f638f0260 100644 --- a/include/image.mk +++ b/include/image.mk @@ -77,10 +77,15 @@ endef define BuildImage download: prepare: -compile: compile-targets +ifneq ($(IB),1) + compile: compile-targets $(call Build/Compile) +else + compile: +endif -install: compile install-targets +ifneq ($(IB),1) + install: compile install-targets $(call Image/Prepare) $(call Image/mkfs/prepare) $(call Image/BuildKernel) @@ -88,9 +93,21 @@ install: compile install-targets $(call Image/mkfs/squashfs) $(call Image/mkfs/tgz) $(call Image/mkfs/ext2) +else + install: compile install-targets + $(call Image/BuildKernel) + $(call Image/mkfs/jffs2) + $(call Image/mkfs/squashfs) + $(call Image/mkfs/tgz) + $(call Image/mkfs/ext2) +endif -clean: clean-targets +ifneq ($(IB),1) + clean: clean-targets $(call Build/Clean) +else + clean: +endif compile-targets: install-targets: diff --git a/include/target.mk b/include/target.mk index 042e85d326..17a41f7c49 100644 --- a/include/target.mk +++ b/include/target.mk @@ -7,6 +7,11 @@ include $(TMP_DIR)/.target.mk +ifeq ($(IB),1) +$(TMP_DIR)/.target.mk: $(TOPDIR)/.target.mk + $(CP) $< $@ +else $(TMP_DIR)/.target.mk: $(TMP_DIR)/.targetinfo $(SCRIPT_DIR)/gen_target_mk.pl < $(TMP_DIR)/.targetinfo > $@ +endif -- cgit v1.2.3