X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/db7f4ab4d2a1c5d385bacf2c695b796d81f7c912..e436f2e66214839f960b5a3481c6c4c82a52c294:/openwrt/target/squashfs-lzma/squashfslzmaroot.mk?ds=inline

diff --git a/openwrt/target/squashfs-lzma/squashfslzmaroot.mk b/openwrt/target/squashfs-lzma/squashfslzmaroot.mk
index 722c20524..bd90cd489 100644
--- a/openwrt/target/squashfs-lzma/squashfslzmaroot.mk
+++ b/openwrt/target/squashfs-lzma/squashfslzmaroot.mk
@@ -4,22 +4,26 @@
 # 
 #############################################################
 
-SQUASHFSLZMA_DIR=$(BUILD_DIR)/squashfs2.1-r2-lzma
-SQUASHFSLZMA_SOURCE=squashfs2.1-r2-lzma.tar.gz
-SQUASHFSLZMA_SITE=http://openwrt.openbsd-geek.de
+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):
-	$(WGET) -P $(DL_DIR) $(SQUASHFSLZMA_SITE)/$(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: $(SQUASHFSLZMA_DIR)/.unpacked
-	$(MAKE) -C $(SQUASHFSLZMA_DIR)/lzma/SRC/7zip/Compress/LZMA_Lib 
-	$(MAKE) -C $(SQUASHFSLZMA_DIR)/squashfs-tools mksquashfs-lzma
+$(SQUASHFSLZMA_DIR)/squashfs-tools/mksquashfs-lzma: $(SQUASHFSLZMA_DIR)/.unpacked
+	$(MAKE) -C $(SQUASHFSLZMA_DIR)/squashfs-tools mksquashfs-lzma LZMAPATH=$(BUILD_DIR)/lzma
 
-squashfslzma: $(SQUASHFSLZMA_DIR)/squashfs-tools/mksquashfs
+$(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)
 
@@ -36,20 +40,7 @@ squashfslzma-dirclean:
 #
 #############################################################
 
-squashfslzmaroot: squashfslzma
-	@rm -rf $(TARGET_DIR)/usr/man
-	@rm -rf $(TARGET_DIR)/usr/info
-	$(SQUASHFSLZMA_DIR)/squashfs-tools/mksquashfs-lzma $(TARGET_DIR) $(IMAGE).squashfslzma -noappend -root-owned -le
-
 squashfslzmaroot-source: squashfslzma-source
 
-squashfslzmaroot-clean:
-	-$(MAKE) -C $(SQUASHFSLZMA_DIR) clean
-
 squashfslzmaroot-dirclean:
 	rm -rf $(SQUASHFSLZMA_DIR)
-
-ifeq ($(strip $(BR2_TARGET_ROOTFS_SQUASHFS_LZMA)),y)
-TARGETS+=squashfslzmaroot openwrt-image
-ROOTFS=squashfslzma
-endif