fix toolchain build, remove some old gcc junk

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

diff --git a/target/linux/image/squashfs.mk b/target/linux/image/squashfs.mk
index 30222c6..29ce552 100644 (file)
--- a/target/linux/image/squashfs.mk
+++ b/target/linux/image/squashfs.mk
@@ -1,24 +1,33 @@
+endian := le
+
+ifeq ($(ARCH),mips)
+       endian := be
+endif
+

 squashfs-prepare:
 squashfs-prepare:

-       $(MAKE) -C squashfs prepare $(MAKE_TRACE)
+       $(MAKE) -C squashfs prepare

 
 squashfs-compile: prepare-targets
 
 squashfs-compile: prepare-targets

-       $(MAKE) -C squashfs compile $(MAKE_TRACE)
+       $(MAKE) -C squashfs compile

        
 squashfs-clean:
        
 squashfs-clean:

-       $(MAKE) -C squashfs clean $(MAKE_TRACE)
+       $(MAKE) -C squashfs clean

        rm -f $(KDIR)/root.squashfs
 
 $(KDIR)/root.squashfs: install-prepare
        @mkdir -p $(KDIR)/root/jffs
        rm -f $(KDIR)/root.squashfs
 
 $(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)
+       
+ifeq ($(IB),)
+squashfs-install: compile-targets $(BOARD)-compile
+endif

 
 

-squashfs-install: install-targets $(KDIR)/root.squashfs $(BOARD)-compile
-       $(TRACE) target/linux/image/$(BOARD)/install
+squashfs-install: $(KDIR)/root.squashfs

        $(MAKE) -C $(BOARD) install KERNEL="$(KERNEL)" FS="squashfs"
 
        $(MAKE) -C $(BOARD) install KERNEL="$(KERNEL)" FS="squashfs"
 

-squashfs-install-ib:
+squashfs-install-ib: compile-targets

        mkdir -p $(IB_DIR)/staging_dir_$(ARCH)/bin
        mkdir -p $(IB_DIR)/staging_dir_$(ARCH)/bin

-       cp $(STAGING_DIR)/bin/mksquashfs-lzma $(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
        
 prepare-targets: squashfs-prepare
 compile-targets: squashfs-compile