SOURCES (LINUX_2_6): squashfs2.2-patch - updated to 2.2-r2.

pluto pluto at pld-linux.org
Sun Oct 30 12:49:26 CET 2005


Author: pluto                        Date: Sun Oct 30 11:49:26 2005 GMT
Module: SOURCES                       Tag: LINUX_2_6
---- Log message:
- updated to 2.2-r2.

---- Files affected:
SOURCES:
   squashfs2.2-patch (1.1 -> 1.1.4.1) 

---- Diffs:

================================================================
Index: SOURCES/squashfs2.2-patch
diff -u SOURCES/squashfs2.2-patch:1.1 SOURCES/squashfs2.2-patch:1.1.4.1
--- SOURCES/squashfs2.2-patch:1.1	Sun Jul 17 22:55:17 2005
+++ SOURCES/squashfs2.2-patch	Sun Oct 30 12:49:20 2005
@@ -1,15 +1,15 @@
-diff --new-file -urp linux-2.6.12/fs/Kconfig linux-2.6.12-squashfs2.2/fs/Kconfig
---- linux-2.6.12/fs/Kconfig	2005-06-17 20:48:29.000000000 +0100
-+++ linux-2.6.12-squashfs2.2/fs/Kconfig	2005-07-04 02:35:35.000000000 +0100
-@@ -1171,6 +1171,69 @@ config CRAMFS
+diff --new-file -urp linux-2.6.13/fs/Kconfig linux-2.6.13-squashfs2.2-r2/fs/Kconfig
+--- linux-2.6.13/fs/Kconfig	2005-08-29 00:41:01.000000000 +0100
++++ linux-2.6.13-squashfs2.2-r2/fs/Kconfig	2005-09-09 00:40:06.000000000 +0100
+@@ -1155,6 +1155,69 @@ config CRAMFS
  
  	  If unsure, say N.
  
 +config SQUASHFS
-+	tristate "SquashFS 2.0 - Squashed file system support"
++	tristate "SquashFS 2.2 - Squashed file system support"
 +	select ZLIB_INFLATE
 +	help
-+	  Saying Y here includes support for SquashFs 2.0 (Compressed Read-Only File
++	  Saying Y here includes support for SquashFS 2.2 (Compressed Read-Only File
 +	  System).  Squashfs is a highly compressed read-only filesystem for Linux.
 +	  It uses zlib compression to compress both files, inodes and directories.
 +	  Inodes in the system are very small and all blocks are packed to minimise
@@ -71,10 +71,10 @@
  config VXFS_FS
  	tristate "FreeVxFS file system support (VERITAS VxFS(TM) compatible)"
  	help
-diff --new-file -urp linux-2.6.12/fs/Makefile linux-2.6.12-squashfs2.2/fs/Makefile
---- linux-2.6.12/fs/Makefile	2005-06-17 20:48:29.000000000 +0100
-+++ linux-2.6.12-squashfs2.2/fs/Makefile	2005-07-04 02:35:35.000000000 +0100
-@@ -52,6 +52,7 @@ obj-$(CONFIG_EXT3_FS)		+= ext3/ # Before
+diff --new-file -urp linux-2.6.13/fs/Makefile linux-2.6.13-squashfs2.2-r2/fs/Makefile
+--- linux-2.6.13/fs/Makefile	2005-08-29 00:41:01.000000000 +0100
++++ linux-2.6.13-squashfs2.2-r2/fs/Makefile	2005-09-09 00:39:17.000000000 +0100
+@@ -55,6 +55,7 @@ obj-$(CONFIG_EXT3_FS)		+= ext3/ # Before
  obj-$(CONFIG_JBD)		+= jbd/
  obj-$(CONFIG_EXT2_FS)		+= ext2/
  obj-$(CONFIG_CRAMFS)		+= cramfs/
@@ -82,9 +82,9 @@
  obj-$(CONFIG_RAMFS)		+= ramfs/
  obj-$(CONFIG_HUGETLBFS)		+= hugetlbfs/
  obj-$(CONFIG_CODA_FS)		+= coda/
-diff --new-file -urp linux-2.6.12/fs/squashfs/inode.c linux-2.6.12-squashfs2.2/fs/squashfs/inode.c
---- linux-2.6.12/fs/squashfs/inode.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.12-squashfs2.2/fs/squashfs/inode.c	2005-07-04 02:35:35.000000000 +0100
+diff --new-file -urp linux-2.6.13/fs/squashfs/inode.c linux-2.6.13-squashfs2.2-r2/fs/squashfs/inode.c
+--- linux-2.6.13/fs/squashfs/inode.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.13-squashfs2.2-r2/fs/squashfs/inode.c	2005-09-09 00:40:54.000000000 +0100
 @@ -0,0 +1,1803 @@
 +/*
 + * Squashfs - a compressed read only filesystem for Linux
@@ -1811,7 +1811,7 @@
 +	if(err)
 +		return err;
 +
-+	printk(KERN_INFO "Squashfs 2.2 (released 2005/07/03) (C) 2002-2005 Phillip Lougher\n");
++	printk(KERN_INFO "Squashfs 2.2-r2 (released 2005/09/08) (C) 2002-2005 Phillip Lougher\n");
 +
 +	if(!(stream.workspace = (char *) vmalloc(zlib_inflate_workspacesize()))) {
 +		ERROR("Failed to allocate zlib workspace\n");
@@ -1889,9 +1889,9 @@
 +MODULE_DESCRIPTION("squashfs, a compressed read-only filesystem");
 +MODULE_AUTHOR("Phillip Lougher <phillip at lougher.demon.co.uk>");
 +MODULE_LICENSE("GPL");
-diff --new-file -urp linux-2.6.12/fs/squashfs/Makefile linux-2.6.12-squashfs2.2/fs/squashfs/Makefile
---- linux-2.6.12/fs/squashfs/Makefile	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.12-squashfs2.2/fs/squashfs/Makefile	2005-07-04 02:35:35.000000000 +0100
+diff --new-file -urp linux-2.6.13/fs/squashfs/Makefile linux-2.6.13-squashfs2.2-r2/fs/squashfs/Makefile
+--- linux-2.6.13/fs/squashfs/Makefile	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.13-squashfs2.2-r2/fs/squashfs/Makefile	2005-09-09 00:39:17.000000000 +0100
 @@ -0,0 +1,7 @@
 +#
 +# Makefile for the linux squashfs routines.
@@ -1900,9 +1900,9 @@
 +obj-$(CONFIG_SQUASHFS) += squashfs.o
 +
 +squashfs-objs := inode.o
-diff --new-file -urp linux-2.6.12/include/linux/squashfs_fs.h linux-2.6.12-squashfs2.2/include/linux/squashfs_fs.h
---- linux-2.6.12/include/linux/squashfs_fs.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.12-squashfs2.2/include/linux/squashfs_fs.h	2005-07-04 02:35:35.000000000 +0100
+diff --new-file -urp linux-2.6.13/include/linux/squashfs_fs.h linux-2.6.13-squashfs2.2-r2/include/linux/squashfs_fs.h
+--- linux-2.6.13/include/linux/squashfs_fs.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.13-squashfs2.2-r2/include/linux/squashfs_fs.h	2005-09-09 00:39:17.000000000 +0100
 @@ -0,0 +1,519 @@
 +#ifndef SQUASHFS_FS
 +#define SQUASHFS_FS
@@ -2423,9 +2423,9 @@
 +#define SQUASHFS_MEMSET(s, d, n)	memset(s, 0, n);
 +#endif
 +#endif
-diff --new-file -urp linux-2.6.12/include/linux/squashfs_fs_i.h linux-2.6.12-squashfs2.2/include/linux/squashfs_fs_i.h
---- linux-2.6.12/include/linux/squashfs_fs_i.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.12-squashfs2.2/include/linux/squashfs_fs_i.h	2005-07-04 02:35:35.000000000 +0100
+diff --new-file -urp linux-2.6.13/include/linux/squashfs_fs_i.h linux-2.6.13-squashfs2.2-r2/include/linux/squashfs_fs_i.h
+--- linux-2.6.13/include/linux/squashfs_fs_i.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.13-squashfs2.2-r2/include/linux/squashfs_fs_i.h	2005-09-09 00:39:17.000000000 +0100
 @@ -0,0 +1,43 @@
 +#ifndef SQUASHFS_FS_I
 +#define SQUASHFS_FS_I
@@ -2470,9 +2470,9 @@
 +	struct inode	vfs_inode;
 +	} squashfs_inode_info;
 +#endif
-diff --new-file -urp linux-2.6.12/include/linux/squashfs_fs_sb.h linux-2.6.12-squashfs2.2/include/linux/squashfs_fs_sb.h
---- linux-2.6.12/include/linux/squashfs_fs_sb.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.12-squashfs2.2/include/linux/squashfs_fs_sb.h	2005-07-04 02:35:35.000000000 +0100
+diff --new-file -urp linux-2.6.13/include/linux/squashfs_fs_sb.h linux-2.6.13-squashfs2.2-r2/include/linux/squashfs_fs_sb.h
+--- linux-2.6.13/include/linux/squashfs_fs_sb.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.13-squashfs2.2-r2/include/linux/squashfs_fs_sb.h	2005-09-09 00:39:17.000000000 +0100
 @@ -0,0 +1,65 @@
 +#ifndef SQUASHFS_FS_SB
 +#define SQUASHFS_FS_SB
@@ -2539,9 +2539,9 @@
 +					char *block_list, unsigned short **block_p, unsigned int *bsize);
 +	} squashfs_sb_info;
 +#endif
-diff --new-file -urp linux-2.6.12/init/do_mounts_rd.c linux-2.6.12-squashfs2.2/init/do_mounts_rd.c
---- linux-2.6.12/init/do_mounts_rd.c	2005-06-17 20:48:29.000000000 +0100
-+++ linux-2.6.12-squashfs2.2/init/do_mounts_rd.c	2005-07-04 02:35:35.000000000 +0100
+diff --new-file -urp linux-2.6.13/init/do_mounts_rd.c linux-2.6.13-squashfs2.2-r2/init/do_mounts_rd.c
+--- linux-2.6.13/init/do_mounts_rd.c	2005-08-29 00:41:01.000000000 +0100
++++ linux-2.6.13-squashfs2.2-r2/init/do_mounts_rd.c	2005-09-09 00:39:17.000000000 +0100
 @@ -5,6 +5,7 @@
  #include <linux/ext2_fs.h>
  #include <linux/romfs_fs.h>
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/squashfs2.2-patch?r1=1.1&r2=1.1.4.1&f=u




More information about the pld-cvs-commit mailing list