aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2007-01-10 21:52:28 +0000
committerFelix Fietkau <nbd@openwrt.org>2007-01-10 21:52:28 +0000
commit7a6a6464971c69fa1026aeaf8fad5c79250230e9 (patch)
treea68bcf07bd0d15b68d1b990877a55002585690b9 /include
parent927fb16abb41cfeeee4e97b4baed2d5ce036ca2e (diff)
downloadupstream-7a6a6464971c69fa1026aeaf8fad5c79250230e9.tar.gz
upstream-7a6a6464971c69fa1026aeaf8fad5c79250230e9.tar.bz2
upstream-7a6a6464971c69fa1026aeaf8fad5c79250230e9.zip
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.
SVN-Revision: 6071
Diffstat (limited to 'include')
-rw-r--r--include/image.mk23
-rw-r--r--include/target.mk5
2 files changed, 25 insertions, 3 deletions
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