summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-11-07 17:18:34 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-11-07 17:18:34 +0000
commite403a481de8e872d3e501a22d6d5d28a14d9fa07 (patch)
tree7174420ffc1e8e10f44eec955a609f81c29adb43
parent9430b7d4f3e2e83cf71e677413444ad3a4f4ef24 (diff)
fix image builder
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2376 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--target/linux/image/jffs2.mk8
-rw-r--r--target/linux/image/squashfs.mk8
2 files changed, 12 insertions, 4 deletions
diff --git a/target/linux/image/jffs2.mk b/target/linux/image/jffs2.mk
index 6d6469dcd..fb8feab47 100644
--- a/target/linux/image/jffs2.mk
+++ b/target/linux/image/jffs2.mk
@@ -19,13 +19,17 @@ $(KDIR)/root.jffs2-8MB: install-prepare
@rm -rf $(KDIR)/root/jffs
$(STAGING_DIR)/bin/mkfs.jffs2 $(JFFS2OPTS) -e 0x20000 -o $@ -d $(KDIR)/root $(MAKE_TRACE)
-jffs2-install: compile-targets $(KDIR)/root.jffs2-4MB $(KDIR)/root.jffs2-8MB $(BOARD)-compile
+ifeq ($(IB),)
+jffs2-install: compile-targets $(BOARD)-compile
+endif
+
+jffs2-install: $(KDIR)/root.jffs2-4MB $(KDIR)/root.jffs2-8MB
$(TRACE) target/linux/image/$(BOARD)/install
$(MAKE) -C $(BOARD) install KERNEL="$(KERNEL)" FS="jffs2-4MB"
$(TRACE) target/linux/image/$(BOARD)/install
$(MAKE) -C $(BOARD) install KERNEL="$(KERNEL)" FS="jffs2-8MB"
-jffs2-install-ib:
+jffs2-install-ib: compile-targets
mkdir -p $(IB_DIR)/staging_dir_$(ARCH)/bin
cp $(STAGING_DIR)/bin/mkfs.jffs2 $(IB_DIR)/staging_dir_$(ARCH)/bin
diff --git a/target/linux/image/squashfs.mk b/target/linux/image/squashfs.mk
index 30222c6ab..63eba445a 100644
--- a/target/linux/image/squashfs.mk
+++ b/target/linux/image/squashfs.mk
@@ -11,12 +11,16 @@ squashfs-clean:
$(KDIR)/root.squashfs: install-prepare
@mkdir -p $(KDIR)/root/jffs
$(STAGING_DIR)/bin/mksquashfs-lzma $(KDIR)/root $@ -nopad -noappend -root-owned -le $(MAKE_TRACE)
+
+ifeq ($(IB),)
+squashfs-install: compile-targets $(BOARD)-compile
+endif
-squashfs-install: install-targets $(KDIR)/root.squashfs $(BOARD)-compile
+squashfs-install: $(KDIR)/root.squashfs
$(TRACE) target/linux/image/$(BOARD)/install
$(MAKE) -C $(BOARD) install KERNEL="$(KERNEL)" FS="squashfs"
-squashfs-install-ib:
+squashfs-install-ib: compile-targets
mkdir -p $(IB_DIR)/staging_dir_$(ARCH)/bin
cp $(STAGING_DIR)/bin/mksquashfs-lzma $(IB_DIR)/staging_dir_$(ARCH)/bin