projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[cavium-octeon] update to 2.6.30-rc5
[openwrt.git]
/
target
/
linux
/
generic-2.6
/
patches-2.6.25
/
001-squashfs.patch
diff --git
a/target/linux/generic-2.6/patches-2.6.25/001-squashfs.patch
b/target/linux/generic-2.6/patches-2.6.25/001-squashfs.patch
index
77128cc
..
b2be831
100644
(file)
--- a/
target/linux/generic-2.6/patches-2.6.25/001-squashfs.patch
+++ b/
target/linux/generic-2.6/patches-2.6.25/001-squashfs.patch
@@
-1,7
+1,5
@@
-Index: linux-2.6.25.1/fs/Kconfig
-===================================================================
---- linux-2.6.25.1.orig/fs/Kconfig
-+++ linux-2.6.25.1/fs/Kconfig
+--- a/fs/Kconfig
++++ b/fs/Kconfig
@@ -1367,6 +1367,71 @@ config CRAMFS
If unsure, say N.
@@ -1367,6 +1367,71 @@ config CRAMFS
If unsure, say N.
@@
-74,10
+72,8
@@
Index: linux-2.6.25.1/fs/Kconfig
config VXFS_FS
tristate "FreeVxFS file system support (VERITAS VxFS(TM) compatible)"
depends on BLOCK
config VXFS_FS
tristate "FreeVxFS file system support (VERITAS VxFS(TM) compatible)"
depends on BLOCK
-Index: linux-2.6.25.1/fs/Makefile
-===================================================================
---- linux-2.6.25.1.orig/fs/Makefile
-+++ linux-2.6.25.1/fs/Makefile
+--- a/fs/Makefile
++++ b/fs/Makefile
@@ -73,6 +73,7 @@ obj-$(CONFIG_JBD) += jbd/
obj-$(CONFIG_JBD2) += jbd2/
obj-$(CONFIG_EXT2_FS) += ext2/
@@ -73,6 +73,7 @@ obj-$(CONFIG_JBD) += jbd/
obj-$(CONFIG_JBD2) += jbd2/
obj-$(CONFIG_EXT2_FS) += ext2/
@@
-86,10
+82,8
@@
Index: linux-2.6.25.1/fs/Makefile
obj-y += ramfs/
obj-$(CONFIG_HUGETLBFS) += hugetlbfs/
obj-$(CONFIG_CODA_FS) += coda/
obj-y += ramfs/
obj-$(CONFIG_HUGETLBFS) += hugetlbfs/
obj-$(CONFIG_CODA_FS) += coda/
-Index: linux-2.6.25.1/fs/squashfs/inode.c
-===================================================================
--- /dev/null
--- /dev/null
-+++
linux-2.6.25.1
/fs/squashfs/inode.c
++++
b
/fs/squashfs/inode.c
@@ -0,0 +1,2122 @@
+/*
+ * Squashfs - a compressed read only filesystem for Linux
@@ -0,0 +1,2122 @@
+/*
+ * Squashfs - a compressed read only filesystem for Linux
@@
-2213,10
+2207,8
@@
Index: linux-2.6.25.1/fs/squashfs/inode.c
+MODULE_DESCRIPTION("squashfs, a compressed read-only filesystem");
+MODULE_AUTHOR("Phillip Lougher <phillip@lougher.org.uk>");
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("squashfs, a compressed read-only filesystem");
+MODULE_AUTHOR("Phillip Lougher <phillip@lougher.org.uk>");
+MODULE_LICENSE("GPL");
-Index: linux-2.6.25.1/fs/squashfs/Makefile
-===================================================================
--- /dev/null
--- /dev/null
-+++
linux-2.6.25.1
/fs/squashfs/Makefile
++++
b
/fs/squashfs/Makefile
@@ -0,0 +1,7 @@
+#
+# Makefile for the linux squashfs routines.
@@ -0,0 +1,7 @@
+#
+# Makefile for the linux squashfs routines.
@@
-2225,10
+2217,8
@@
Index: linux-2.6.25.1/fs/squashfs/Makefile
+obj-$(CONFIG_SQUASHFS) += squashfs.o
+squashfs-y += inode.o
+squashfs-y += squashfs2_0.o
+obj-$(CONFIG_SQUASHFS) += squashfs.o
+squashfs-y += inode.o
+squashfs-y += squashfs2_0.o
-Index: linux-2.6.25.1/fs/squashfs/squashfs2_0.c
-===================================================================
--- /dev/null
--- /dev/null
-+++
linux-2.6.25.1
/fs/squashfs/squashfs2_0.c
++++
b
/fs/squashfs/squashfs2_0.c
@@ -0,0 +1,758 @@
+/*
+ * Squashfs - a compressed read only filesystem for Linux
@@ -0,0 +1,758 @@
+/*
+ * Squashfs - a compressed read only filesystem for Linux
@@
-2988,10
+2978,8
@@
Index: linux-2.6.25.1/fs/squashfs/squashfs2_0.c
+
+ return 1;
+}
+
+ return 1;
+}
-Index: linux-2.6.25.1/fs/squashfs/squashfs.h
-===================================================================
--- /dev/null
--- /dev/null
-+++
linux-2.6.25.1
/fs/squashfs/squashfs.h
++++
b
/fs/squashfs/squashfs.h
@@ -0,0 +1,86 @@
+/*
+ * Squashfs - a compressed read only filesystem for Linux
@@ -0,0 +1,86 @@
+/*
+ * Squashfs - a compressed read only filesystem for Linux
@@
-3079,10
+3067,8
@@
Index: linux-2.6.25.1/fs/squashfs/squashfs.h
+ return 0;
+}
+#endif
+ return 0;
+}
+#endif
-Index: linux-2.6.25.1/include/linux/magic.h
-===================================================================
---- linux-2.6.25.1.orig/include/linux/magic.h
-+++ linux-2.6.25.1/include/linux/magic.h
+--- a/include/linux/magic.h
++++ b/include/linux/magic.h
@@ -35,6 +35,9 @@
#define REISER2FS_SUPER_MAGIC_STRING "ReIsEr2Fs"
#define REISER2FS_JR_SUPER_MAGIC_STRING "ReIsEr3Fs"
@@ -35,6 +35,9 @@
#define REISER2FS_SUPER_MAGIC_STRING "ReIsEr2Fs"
#define REISER2FS_JR_SUPER_MAGIC_STRING "ReIsEr3Fs"
@@
-3093,10
+3079,8
@@
Index: linux-2.6.25.1/include/linux/magic.h
#define SMB_SUPER_MAGIC 0x517B
#define USBDEVICE_SUPER_MAGIC 0x9fa2
#define CGROUP_SUPER_MAGIC 0x27e0eb
#define SMB_SUPER_MAGIC 0x517B
#define USBDEVICE_SUPER_MAGIC 0x9fa2
#define CGROUP_SUPER_MAGIC 0x27e0eb
-Index: linux-2.6.25.1/include/linux/squashfs_fs.h
-===================================================================
--- /dev/null
--- /dev/null
-+++
linux-2.6.25.1
/include/linux/squashfs_fs.h
++++
b
/include/linux/squashfs_fs.h
@@ -0,0 +1,911 @@
+#ifndef SQUASHFS_FS
+#define SQUASHFS_FS
@@ -0,0 +1,911 @@
+#ifndef SQUASHFS_FS
+#define SQUASHFS_FS
@@
-4009,10
+3993,8
@@
Index: linux-2.6.25.1/include/linux/squashfs_fs.h
+
+#endif
+#endif
+
+#endif
+#endif
-Index: linux-2.6.25.1/include/linux/squashfs_fs_i.h
-===================================================================
--- /dev/null
--- /dev/null
-+++
linux-2.6.25.1
/include/linux/squashfs_fs_i.h
++++
b
/include/linux/squashfs_fs_i.h
@@ -0,0 +1,45 @@
+#ifndef SQUASHFS_FS_I
+#define SQUASHFS_FS_I
@@ -0,0 +1,45 @@
+#ifndef SQUASHFS_FS_I
+#define SQUASHFS_FS_I
@@
-4059,10
+4041,8
@@
Index: linux-2.6.25.1/include/linux/squashfs_fs_i.h
+ struct inode vfs_inode;
+};
+#endif
+ struct inode vfs_inode;
+};
+#endif
-Index: linux-2.6.25.1/include/linux/squashfs_fs_sb.h
-===================================================================
--- /dev/null
--- /dev/null
-+++
linux-2.6.25.1
/include/linux/squashfs_fs_sb.h
++++
b
/include/linux/squashfs_fs_sb.h
@@ -0,0 +1,74 @@
+#ifndef SQUASHFS_FS_SB
+#define SQUASHFS_FS_SB
@@ -0,0 +1,74 @@
+#ifndef SQUASHFS_FS_SB
+#define SQUASHFS_FS_SB
@@
-4138,10
+4118,8
@@
Index: linux-2.6.25.1/include/linux/squashfs_fs_sb.h
+ int (*read_fragment_index_table)(struct super_block *s);
+};
+#endif
+ int (*read_fragment_index_table)(struct super_block *s);
+};
+#endif
-Index: linux-2.6.25.1/init/do_mounts_rd.c
-===================================================================
---- linux-2.6.25.1.orig/init/do_mounts_rd.c
-+++ linux-2.6.25.1/init/do_mounts_rd.c
+--- a/init/do_mounts_rd.c
++++ b/init/do_mounts_rd.c
@@ -5,6 +5,7 @@
#include <linux/ext2_fs.h>
#include <linux/romfs_fs.h>
@@ -5,6 +5,7 @@
#include <linux/ext2_fs.h>
#include <linux/romfs_fs.h>
This page took
0.036931 seconds
and
4
git commands to generate.
projects / openwrt.git / blobdiff