backport inline changes from 2.6.16-rc1, thanks nbd for helping me finish it :)

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

diff --git a/openwrt/target/linux/image/squashfs.mk b/openwrt/target/linux/image/squashfs.mk
index 30222c6..7fe972a 100644 (file)
--- a/openwrt/target/linux/image/squashfs.mk
+++ b/openwrt/target/linux/image/squashfs.mk
@@ -1,3 +1,9 @@
+endian := le
+
+ifeq ($(ARCH),mips)
+       endian := be
+endif
+
 squashfs-prepare:
        $(MAKE) -C squashfs prepare $(MAKE_TRACE)
 
@@ -10,13 +16,17 @@ 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)
+       $(STAGING_DIR)/bin/mksquashfs-lzma $(KDIR)/root $@ -nopad -noappend -root-owned -$(endian) $(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