packages: kernel/kernel-squashfs-lzma.patch - updated for 2.6.36

[arekm]

Author: arekm                        Date: Thu Oct 21 06:28:35 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated for 2.6.36

---- Files affected:
packages/kernel:
   kernel-squashfs-lzma.patch (1.6 -> 1.7) 

---- Diffs:

================================================================
Index: packages/kernel/kernel-squashfs-lzma.patch
diff -u packages/kernel/kernel-squashfs-lzma.patch:1.6 packages/kernel/kernel-squashfs-lzma.patch:1.7
--- packages/kernel/kernel-squashfs-lzma.patch:1.6	Thu Aug  5 21:52:26 2010
+++ packages/kernel/kernel-squashfs-lzma.patch	Thu Oct 21 08:28:30 2010
@@ -1,7 +1,7 @@
 diff -Nru a/fs/squashfs/decompressor.c b/fs/squashfs/decompressor.c
 --- a/fs/squashfs/decompressor.c	2010-05-16 23:17:36.000000000 +0200
 +++ b/fs/squashfs/decompressor.c	2010-05-17 14:57:45.271547099 +0200
-@@ -50,7 +50,11 @@
+@@ -52,7 +52,11 @@
  
  static const struct squashfs_decompressor *decompressor[] = {
  	&squashfs_zlib_comp_ops,
@@ -10,9 +10,9 @@
 +#else
  	&squashfs_lzma_unsupported_comp_ops,
 +#endif
- 	&squashfs_lzo_unsupported_comp_ops,
- 	&squashfs_unknown_comp_ops
- };
+ #ifdef CONFIG_SQUASHFS_LZO
+ 	&squashfs_lzo_comp_ops,
+ #else
 diff -Nru a/fs/squashfs/Kconfig b/fs/squashfs/Kconfig
 --- a/fs/squashfs/Kconfig	2010-05-16 23:17:36.000000000 +0200
 +++ b/fs/squashfs/Kconfig	2010-05-17 15:13:49.807545765 +0200
@@ -188,22 +188,24 @@
 diff -Nru a/fs/squashfs/Makefile b/fs/squashfs/Makefile
 --- a/fs/squashfs/Makefile	2010-05-16 23:17:36.000000000 +0200
 +++ b/fs/squashfs/Makefile	2010-05-17 14:57:45.270554026 +0200
-@@ -6,4 +6,4 @@
+@@ -6,4 +6,5 @@
  squashfs-y += block.o cache.o dir.o export.o file.o fragment.o id.o inode.o
  squashfs-y += namei.o super.o symlink.o zlib_wrapper.o decompressor.o
- squashfs-$(CONFIG_SQUASHFS_XATTRS) += xattr.o xattr_id.o
--
+ squashfs-$(CONFIG_SQUASHFS_XATTR) += xattr.o xattr_id.o
 +squashfs-$(CONFIG_SQUASHFS_LZMA) += lzma_wrapper.o
+ squashfs-$(CONFIG_SQUASHFS_LZO) += lzo_wrapper.o
 diff -Nru a/fs/squashfs/squashfs.h b/fs/squashfs/squashfs.h
 --- a/fs/squashfs/squashfs.h	2010-05-16 23:17:36.000000000 +0200
 +++ b/fs/squashfs/squashfs.h	2010-05-17 14:57:45.310795600 +0200
-@@ -94,3 +94,6 @@
- 
+@@ -105,5 +105,8 @@
  /* zlib_wrapper.c */
  extern const struct squashfs_decompressor squashfs_zlib_comp_ops;
-+
+ 
 +/* lzma wrapper.c */
 +extern const struct squashfs_decompressor squashfs_lzma_comp_ops;
++
+ /* lzo_wrapper.c */
+ extern const struct squashfs_decompressor squashfs_lzo_comp_ops;
 diff -Nru a/include/linux/decompress/bunzip2_mm.h b/include/linux/decompress/bunzip2_mm.h
 --- a/include/linux/decompress/bunzip2_mm.h	1970-01-01 01:00:00.000000000 +0100
 +++ b/include/linux/decompress/bunzip2_mm.h	2010-05-17 15:14:15.255545839 +0200
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-squashfs-lzma.patch?r1=1.6&r2=1.7&f=u