generic lzma loader: add support for memory copying, preserve prom arguments

[openwrt.git] / target / linux / image / squashfs / patches / 100-lzma.patch

diff --git a/target/linux/image/squashfs/patches/100-lzma.patch b/target/linux/image/squashfs/patches/100-lzma.patch
index 324f8d8..85aa21f 100644 (file)
--- a/target/linux/image/squashfs/patches/100-lzma.patch
+++ b/target/linux/image/squashfs/patches/100-lzma.patch
@@ -1,22 +1,25 @@
---- squashfs2.0/squashfs-tools/Makefile        2004-04-30 19:29:35.000000000 +0400
-+++ squashfs-tools/Makefile    2005-01-20 14:57:53.423668596 +0300
-@@ -1,12 +1,18 @@
+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
+@@ -1,4 +1,5 @@

  INCLUDEDIR = .
 +#LZMAPATH = ../lzma/SRC/7zip/Compress/LZMA_Lib
  
  CFLAGS := -I$(INCLUDEDIR) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -O2
  
  INCLUDEDIR = .
 +#LZMAPATH = ../lzma/SRC/7zip/Compress/LZMA_Lib
  
  CFLAGS := -I$(INCLUDEDIR) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -O2
  

+@@ -7,6 +8,9 @@

  mksquashfs: mksquashfs.o read_fs.o sort.o
        $(CC) mksquashfs.o read_fs.o sort.o -lz -o $@
  
 +mksquashfs-lzma: mksquashfs.o read_fs.o sort.o
 +      $(CXX) mksquashfs.o read_fs.o sort.o -L$(LZMAPATH) -llzma -o $@
 +
  mksquashfs: mksquashfs.o read_fs.o sort.o
        $(CC) mksquashfs.o read_fs.o sort.o -lz -o $@
  
 +mksquashfs-lzma: mksquashfs.o read_fs.o sort.o
 +      $(CXX) mksquashfs.o read_fs.o sort.o -L$(LZMAPATH) -llzma -o $@
 +

- mksquashfs.o: mksquashfs.c mksquashfs.h
+ mksquashfs.o: mksquashfs.c squashfs_fs.h mksquashfs.h global.h sort.h

  
  

- read_fs.o: read_fs.c read_fs.h
+ read_fs.o: read_fs.c squashfs_fs.h read_fs.h global.h
+@@ -17,3 +21,5 @@
+       $(CC) unsquashfs.o -lz -o $@

  
  

- sort.o: sort.c
+ unsquashfs.o: unsquashfs.c squashfs_fs.h read_fs.h global.h

 +
 +clean:
 +
 +clean:

-+      rm -f *.o mksquashfs mksquashfs-lzma