X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=target%2Fsquashfs%2Fsquashfsroot.mk;h=d3a104a83f3e6f0ed8e4ed4f95cbb72c5fe04de5;hb=990231f8414f8720aa36ebc57359580481bd0c95;hp=f97b6419a5eedff71eeedb2dd384a41b674a1c6e;hpb=ac73de9ec39b84dffde99a2ece362d22259c19b3;p=openwrt-10.03%2F.git

diff --git a/target/squashfs/squashfsroot.mk b/target/squashfs/squashfsroot.mk
index f97b6419a..d3a104a83 100644
--- a/target/squashfs/squashfsroot.mk
+++ b/target/squashfs/squashfsroot.mk
@@ -4,8 +4,6 @@
 # 
 #############################################################
 
-ROOTFSTYPE=squashfs
-
 SQUASHFS_DIR=$(BUILD_DIR)/squashfs2.1-r2
 SQUASHFS_SOURCE=squashfs2.1-r2.tar.gz
 SQUASHFS_SITE=http://dl.sourceforge.net/sourceforge/squashfs
@@ -40,7 +38,7 @@ squashfs-dirclean:
 squashfsroot: squashfs
 	@rm -rf $(TARGET_DIR)/usr/man
 	@rm -rf $(TARGET_DIR)/usr/info
-	$(SQUASHFS_DIR)/squashfs-tools/mksquashfs $(TARGET_DIR) $(IMAGE).$(ROOTFSTYPE) -noappend -root-owned -le
+	$(SQUASHFS_DIR)/squashfs-tools/mksquashfs $(TARGET_DIR) $(IMAGE).squashfs -noappend -root-owned -le
 
 squashfsroot-source: squashfs-source
 
@@ -50,13 +48,7 @@ squashfsroot-clean:
 squashfsroot-dirclean:
 	rm -rf $(SQUASHFS_DIR)
 
-openwrt-linux.trx.$(ROOTFSTYPE):
-	$(BUILD_DIR)/trx -o openwrt-linux.trx.$(ROOTFSTYPE) $(LINUX_DIR)/$(LINUX_BINLOC) $(IMAGE).$(ROOTFSTYPE)
-
-openwrt-gs-code.bin.$(ROOTFSTYPE): openwrt-linux.trx.$(ROOTFSTYPE)
-	$(BUILD_DIR)/addpattern -2 -i  openwrt-linux.trx.$(ROOTFSTYPE) -o openwrt-gs-code.bin.$(ROOTFSTYPE) -g
-
-openwrt-g-code.bin.$(ROOTFSTYPE): openwrt-gs-code.bin.$(ROOTFSTYPE)
-	sed -e "1s,^W54S,W54G," < openwrt-gs-code.bin.$(ROOTFSTYPE) > openwrt-g-code.bin.$(ROOTFSTYPE)
-
-openwrt-image:	openwrt-g-code.bin.$(ROOTFSTYPE)
+ifeq ($(strip $(BR2_TARGET_ROOTFS_SQUASHFS)),y)
+TARGETS+=squashfsroot openwrt-image
+ROOTFS=squashfs
+endif