fix image builder
authorFelix Fietkau <nbd@openwrt.org>
Mon, 7 Nov 2005 17:18:34 +0000 (17:18 +0000)
committerFelix Fietkau <nbd@openwrt.org>
Mon, 7 Nov 2005 17:18:34 +0000 (17:18 +0000)
SVN-Revision: 2376

openwrt/target/linux/image/jffs2.mk
openwrt/target/linux/image/squashfs.mk

index 6d6469dcd3323c21af8db8a4f6cfb4a389d9e9e0..fb8feab474f9f979c0d7c4f894e0b232576b7a47 100644 (file)
@@ -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
 
index 30222c6abf9640d71197c49d3df087f916fd9a0d..63eba445a04cad2bf8d6ee8cd614601158ff4921 100644 (file)
@@ -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