move target/linux/package/switch to package/, fix a bug in the ipkg dependency handling

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

diff --git a/target/linux/image/squashfs.mk b/target/linux/image/squashfs.mk
index 3811567..abc58da 100644 (file)
--- a/target/linux/image/squashfs.mk
+++ b/target/linux/image/squashfs.mk
@@ -1,7 +1,13 @@
+ifneq ($(CONFIG_BIG_ENDIAN),y)
+endian := le
+else
+endian := be
+endif
+

 squashfs-prepare:
        $(MAKE) -C squashfs prepare
 
 squashfs-prepare:
        $(MAKE) -C squashfs prepare
 

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

        $(MAKE) -C squashfs compile
        
 squashfs-clean:
        $(MAKE) -C squashfs compile
        
 squashfs-clean:


@@ -10,17 +16,21 @@ squashfs-clean:
 
 $(KDIR)/root.squashfs: install-prepare
        @mkdir -p $(KDIR)/root/jffs
 
 $(KDIR)/root.squashfs: install-prepare
        @mkdir -p $(KDIR)/root/jffs

-       $(STAGING_DIR)/bin/mksquashfs-lzma $(KDIR)/root $@ -nopad -noappend -root-owned -le
+       $(STAGING_DIR)/bin/mksquashfs-lzma $(KDIR)/root $@ -nopad -noappend -root-owned -$(endian)
+       
+ifeq ($(IB),)
+squashfs-install: compile-targets $(BOARD)-compile
+endif

 
 squashfs-install: $(KDIR)/root.squashfs
        $(MAKE) -C $(BOARD) install KERNEL="$(KERNEL)" FS="squashfs"
 
 
 squashfs-install: $(KDIR)/root.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: squashfs-prepare
-compile: squashfs-compile
-install: squashfs-install
+prepare-targets: squashfs-prepare
+compile-targets: squashfs-compile
+install-targets: squashfs-install

 install-ib: squashfs-install-ib
 clean: squashfs-clean
 install-ib: squashfs-install-ib
 clean: squashfs-clean