From: ralph <ralph@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Mon, 16 Jun 2008 11:32:13 +0000 (+0000)
Subject: added unsquashfs-lzma, usefull for debugging of existing fs images
X-Git-Url: http://git.ozo.com/?p=openwrt-10.03%2F.git;a=commitdiff_plain;h=07d64ac0ad3f412d234b7179f858b40f7d5ec579

added unsquashfs-lzma, usefull for debugging of existing fs images


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11496 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/tools/squashfs/Makefile b/tools/squashfs/Makefile
index d0098361f..53baa7abf 100644
--- a/tools/squashfs/Makefile
+++ b/tools/squashfs/Makefile
@@ -21,15 +21,17 @@ include $(INCLUDE_DIR)/host-build.mk
 define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR)/squashfs-tools \
 		LZMAPATH=$(STAGING_DIR_HOST)/lib \
-		mksquashfs-lzma 
+		mksquashfs-lzma unsquashfs-lzma 
 endef
 
 define Build/Install
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/squashfs-tools/mksquashfs-lzma $(STAGING_DIR_HOST)/bin/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/squashfs-tools/unsquashfs-lzma $(STAGING_DIR_HOST)/bin/
 endef
 
 define Build/Clean
 	rm -f $(STAGING_DIR_HOST)/bin/mksquashfs-lzma
+	rm -f $(STAGING_DIR_HOST)/bin/unsquashfs-lzma
 endef
 
 $(eval $(call HostBuild))
diff --git a/tools/squashfs/patches/100-lzma.patch b/tools/squashfs/patches/100-lzma.patch
index 85aa21fb9..34fdcad18 100644
--- a/tools/squashfs/patches/100-lzma.patch
+++ b/tools/squashfs/patches/100-lzma.patch
@@ -1,6 +1,5 @@
-diff -Nur squashfs3.0/squashfs-tools/Makefile squashfs3.0-owrt/squashfs-tools/Makefile
---- squashfs3.0/squashfs-tools/Makefile	2006-03-15 22:36:20.000000000 +0100
-+++ squashfs3.0-owrt/squashfs-tools/Makefile	2006-03-21 11:14:08.000000000 +0100
+--- a/squashfs-tools/Makefile
++++ b/squashfs-tools/Makefile
 @@ -1,4 +1,5 @@
  INCLUDEDIR = .
 +#LZMAPATH = ../lzma/SRC/7zip/Compress/LZMA_Lib
@@ -17,9 +16,13 @@ diff -Nur squashfs3.0/squashfs-tools/Makefile squashfs3.0-owrt/squashfs-tools/Ma
  mksquashfs.o: mksquashfs.c squashfs_fs.h mksquashfs.h global.h sort.h
  
  read_fs.o: read_fs.c squashfs_fs.h read_fs.h global.h
-@@ -17,3 +21,5 @@
+@@ -16,4 +20,9 @@
+ unsquashfs: unsquashfs.o
  	$(CC) unsquashfs.o -lz -o $@
  
++unsquashfs-lzma: unsquashfs.o
++	$(CXX) unsquashfs.o -L$(LZMAPATH) -llzma -o $@
++
  unsquashfs.o: unsquashfs.c squashfs_fs.h read_fs.h global.h
 +
 +clean: