3 files changed, 30 insertions, 56 deletions
diff --git a/target/squashfs-lzma/Makefile b/target/squashfs-lzma/Makefile
index 2664ed7e2..3a61d0623 100644
--- a/target/squashfs-lzma/Makefile
+++ b/target/squashfs-lzma/Makefile
@@ -1,16 +1,36 @@
 include $(TOPDIR)/rules.mk
-include ./squashfslzmaroot.mk
 
-SQUASHFS_TARGETS:=$(BIN_DIR)/openwrt-generic-squashfs.trx
+SQUASHFSLZMA_DIR=$(BUILD_DIR)/squashfs2.1-r2
+SQUASHFSLZMA_SOURCE=squashfs2.1-r2.tar.gz
+SQUASHFSLZMA_SITE=@SF/squashfs
+SQUASHFSLZMA_MD5SUM=ffa24eff13b2ca51ed6990d15237e4c1
 
+$(DL_DIR)/$(SQUASHFSLZMA_SOURCE):
+	$(SCRIPT_DIR)/download.pl $(DL_DIR) $(SQUASHFSLZMA_SOURCE) $(SQUASHFSLZMA_MD5SUM) $(SQUASHFSLZMA_SITE)
+
+$(SQUASHFSLZMA_DIR)/.unpacked: $(DL_DIR)/$(SQUASHFSLZMA_SOURCE) 
+	zcat $(DL_DIR)/$(SQUASHFSLZMA_SOURCE) | tar -C $(BUILD_DIR) -xvf -
+	$(PATCH) $(SQUASHFSLZMA_DIR) ./patches
+	touch $(SQUASHFSLZMA_DIR)/.unpacked
+
+$(SQUASHFSLZMA_DIR)/squashfs-tools/mksquashfs-lzma: $(SQUASHFSLZMA_DIR)/.unpacked
+	$(MAKE) -C $(SQUASHFSLZMA_DIR)/squashfs-tools mksquashfs-lzma LZMAPATH=$(BUILD_DIR)/lzma
+
+$(STAGING_DIR)/bin/mksquashfs-lzma: $(SQUASHFSLZMA_DIR)/squashfs-tools/mksquashfs-lzma
+	cp $< $@
+
+source: $(DL_DIR)/$(SQUASHFSLZMA_SOURCE)
 prepare: $(SQUASHFSLZMA_DIR)/.unpacked
-compile: squashfslzma
-install: $(SQUASHFS_TARGETS)
-clean: squashfslzmaroot-dirclean
+compile: $(SQUASHFSLZMA_DIR)/squashfs-tools/mksquashfs-lzma $(STAGING_DIR)/bin/mksquashfs-lzma
+install:
+clean: 
+	rm -rf $(SQUASHFSLZMA_DIR)
 
-$(BIN_DIR)/openwrt-generic-squashfs.trx:
-	@mkdir -p $(TARGET_DIR)/jffs
-	PATH=$(TARGET_PATH) mksquashfs-lzma $(TARGET_DIR) $(IMAGE).squashfslzma -noappend -root-owned -le
+FILESYSTEMS:=squashfs
+define squashfs_template
+	@mkdir -p $(1)/root/jffs
+	PATH=$(TARGET_PATH) mksquashfs-lzma $(1)/root $(1)/root.squashfs -noappend -root-owned -le
 	PATH=$(TARGET_PATH) trx -o $@ $(BUILD_DIR)/loader.gz \
-	 $(LINUX_IMAGE) $(IMAGE).squashfslzma
-	 
+		$(1)/kernel-image $(1)/root.squashfs
+endef
+include ../image.mk
diff --git a/target/squashfs-lzma/squashfs2.0-tools-lzma.patch b/target/squashfs-lzma/patches/100-lzma.patch
index 324f8d822..324f8d822 100644
--- a/target/squashfs-lzma/squashfs2.0-tools-lzma.patch
+++ b/target/squashfs-lzma/patches/100-lzma.patch
diff --git a/target/squashfs-lzma/squashfslzmaroot.mk b/target/squashfs-lzma/squashfslzmaroot.mk
deleted file mode 100644
index bd90cd489..000000000
--- a/target/squashfs-lzma/squashfslzmaroot.mk
+++ /dev/null
@@ -1,46 +0,0 @@
-#############################################################
-#
-# squashfs target 
-# 
-#############################################################
-
-SQUASHFSLZMA_DIR=$(BUILD_DIR)/squashfs2.1-r2
-SQUASHFSLZMA_SOURCE=squashfs2.1-r2.tar.gz
-SQUASHFSLZMA_SITE=@SF/squashfs
-SQUASHFSLZMA_MD5SUM=ffa24eff13b2ca51ed6990d15237e4c1
-
-$(DL_DIR)/$(SQUASHFSLZMA_SOURCE):
-	$(SCRIPT_DIR)/download.pl $(DL_DIR) $(SQUASHFSLZMA_SOURCE) $(SQUASHFSLZMA_MD5SUM) $(SQUASHFSLZMA_SITE)
-
-$(SQUASHFSLZMA_DIR)/.unpacked: $(DL_DIR)/$(SQUASHFSLZMA_SOURCE) 
-	zcat $(DL_DIR)/$(SQUASHFSLZMA_SOURCE) | tar -C $(BUILD_DIR) -xvf -
-	patch -d $(SQUASHFSLZMA_DIR) -p1 < squashfs2.0-tools-lzma.patch
-	touch $(SQUASHFSLZMA_DIR)/.unpacked
-
-$(SQUASHFSLZMA_DIR)/squashfs-tools/mksquashfs-lzma: $(SQUASHFSLZMA_DIR)/.unpacked
-	$(MAKE) -C $(SQUASHFSLZMA_DIR)/squashfs-tools mksquashfs-lzma LZMAPATH=$(BUILD_DIR)/lzma
-
-$(STAGING_DIR)/bin/mksquashfs-lzma: $(SQUASHFSLZMA_DIR)/squashfs-tools/mksquashfs-lzma
-	cp $< $@
-
-squashfslzma: $(SQUASHFSLZMA_DIR)/squashfs-tools/mksquashfs-lzma $(STAGING_DIR)/bin/mksquashfs-lzma
-	
-squashfslzma-source: $(DL_DIR)/$(SQUASHFSLZMA_SOURCE)
-
-squashfslzma-clean:
-	-$(MAKE) -C $(SQUASHFSLZMA_DIR)/squashfs-tools clean
-
-squashfslzma-dirclean:
-	rm -rf $(SQUASHFSLZMA_DIR)
-
-
-#############################################################
-#
-# Build the squashfs root filesystem image
-#
-#############################################################
-
-squashfslzmaroot-source: squashfslzma-source
-
-squashfslzmaroot-dirclean:
-	rm -rf $(SQUASHFSLZMA_DIR)