Changeset 23045


Ignore:
Timestamp:
2010-09-13T09:21:38+02:00 (6 years ago)
Author:
acoul
Message:

linux/generic: semi-revert squashfs 2.6.36 changes until lzma code gets ready for mainlin inclusion

Location:
trunk/target/linux/generic/patches-2.6.36
Files:
1 added
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/generic/patches-2.6.36/006-squashfs_add_lzma.patch

    r22832 r23045  
    3333--- a/fs/squashfs/Makefile 
    3434+++ b/fs/squashfs/Makefile 
    35 @@ -5,5 +5,4 @@ 
     35@@ -5,5 +5,5 @@ 
    3636 obj-$(CONFIG_SQUASHFS) += squashfs.o 
    3737 squashfs-y += block.o cache.o dir.o export.o file.o fragment.o id.o inode.o 
    3838 squashfs-y += namei.o super.o symlink.o zlib_wrapper.o decompressor.o 
    39 -squashfs-$(CONFIG_SQUASHFS_XATTR) += xattr.o xattr_id.o 
    40 -squashfs-$(CONFIG_SQUASHFS_LZO) += lzo_wrapper.o 
     39-squashfs-$(CONFIG_SQUASHFS_XATTRS) += xattr.o xattr_id.o 
    4140+squashfs-$(CONFIG_SQUASHFS_LZMA) += lzma_wrapper.o 
     41  
    4242--- a/fs/squashfs/decompressor.c 
    4343+++ b/fs/squashfs/decompressor.c 
    44 @@ -53,8 +53,8 @@ static const struct squashfs_decompresso 
     44@@ -50,7 +50,11 @@ static const struct squashfs_decompresso 
     45  
    4546 static const struct squashfs_decompressor *decompressor[] = { 
    4647        &squashfs_zlib_comp_ops, 
    47         &squashfs_lzma_unsupported_comp_ops, 
    48 -#ifdef CONFIG_SQUASHFS_LZO 
    49 -       &squashfs_lzo_comp_ops, 
    5048+#ifdef CONFIG_SQUASHFS_LZMA 
    5149+       &squashfs_lzma_comp_ops, 
    52  #else 
     50+#else 
     51        &squashfs_lzma_unsupported_comp_ops, 
     52+#endif 
    5353        &squashfs_lzo_unsupported_comp_ops, 
    54  #endif 
     54        &squashfs_unknown_comp_ops 
     55 }; 
    5556--- /dev/null 
    5657+++ b/fs/squashfs/lzma_wrapper.c 
     
    210211--- a/fs/squashfs/squashfs.h 
    211212+++ b/fs/squashfs/squashfs.h 
    212 @@ -105,5 +105,5 @@ extern const struct xattr_handler *squas 
     213@@ -104,3 +104,6 @@ extern const struct xattr_handler *squas 
     214  
    213215 /* zlib_wrapper.c */ 
    214216 extern const struct squashfs_decompressor squashfs_zlib_comp_ops; 
    215   
    216 -/* lzo_wrapper.c */ 
    217 -extern const struct squashfs_decompressor squashfs_lzo_comp_ops; 
    218 +/* lzma_wrapper.c */ 
     217+ 
     218+/* lzma wrapper.c */ 
    219219+extern const struct squashfs_decompressor squashfs_lzma_comp_ops; 
Note: See TracChangeset for help on using the changeset viewer.