summaryrefslogtreecommitdiffstats
path: root/target/linux/image/squashfs
diff options
context:
space:
mode:
authorkaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-03-21 13:41:09 +0000
committerkaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-03-21 13:41:09 +0000
commit984ce03b6ab1e6039dba65a1a6c71e9f1961054f (patch)
tree209fe66ea4939dc81d09718f3182bdaf68258e49 /target/linux/image/squashfs
parentb3306d97c9340b8072e17abe28ede64d866c6055 (diff)
upgrade to squashfs 3.0
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@3431 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/image/squashfs')
-rw-r--r--target/linux/image/squashfs/patches/100-lzma.patch17
1 files changed, 10 insertions, 7 deletions
diff --git a/target/linux/image/squashfs/patches/100-lzma.patch b/target/linux/image/squashfs/patches/100-lzma.patch
index 324f8d822..85aa21fb9 100644
--- 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
+@@ -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.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:
-+ rm -f *.o mksquashfs mksquashfs-lzma