fix image builder

[openwrt.git] / target / linux / image / squashfs.mk

diff --git a/target/linux/image/squashfs.mk b/target/linux/image/squashfs.mk
index e9a95de..63eba44 100644 (file)
--- a/target/linux/image/squashfs.mk
+++ b/target/linux/image/squashfs.mk
@@ -1,19 +1,31 @@
 squashfs-prepare:
-       $(MAKE) -C squashfs prepare
+       $(MAKE) -C squashfs prepare $(MAKE_TRACE)
 
-squashfs-compile:
-       $(MAKE) -C squashfs compile
+squashfs-compile: prepare-targets
+       $(MAKE) -C squashfs compile $(MAKE_TRACE)
        
 squashfs-clean:
-       $(MAKE) -C squashfs clean
+       $(MAKE) -C squashfs clean $(MAKE_TRACE)
        rm -f $(KDIR)/root.squashfs
 
-$(KDIR)/root.squashfs:
+$(KDIR)/root.squashfs: install-prepare
        @mkdir -p $(KDIR)/root/jffs
-       $(STAGING_DIR)/bin/mksquashfs-lzma $(KDIR)/root $@ -noappend -root-owned -le
+       $(STAGING_DIR)/bin/mksquashfs-lzma $(KDIR)/root $@ -nopad -noappend -root-owned -le $(MAKE_TRACE)
+       
+ifeq ($(IB),)
+squashfs-install: compile-targets $(BOARD)-compile
+endif
 
-prepare: squashfs-prepare
-compile: squashfs-compile
-install: $(KDIR)/root.squashfs
+squashfs-install: $(KDIR)/root.squashfs
+       $(TRACE) target/linux/image/$(BOARD)/install
        $(MAKE) -C $(BOARD) install KERNEL="$(KERNEL)" FS="squashfs"
 
+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
+       
+prepare-targets: squashfs-prepare
+compile-targets: squashfs-compile
+install-targets: squashfs-install
+install-ib: squashfs-install-ib
+clean: squashfs-clean