projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[ppc40x] enable GPIO sysfs interface
[openwrt.git]
/
target
/
linux
/
generic-2.4
/
patches
/
001-squashfs.patch
diff --git
a/target/linux/generic-2.4/patches/001-squashfs.patch
b/target/linux/generic-2.4/patches/001-squashfs.patch
index
4ebfb75
..
2e5cefe
100644
(file)
--- a/
target/linux/generic-2.4/patches/001-squashfs.patch
+++ b/
target/linux/generic-2.4/patches/001-squashfs.patch
@@
-1,7
+1,5
@@
-Index: linux-2.4.35.4/fs/Config.in
-===================================================================
---- linux-2.4.35.4.orig/fs/Config.in
-+++ linux-2.4.35.4/fs/Config.in
+--- a/fs/Config.in
++++ b/fs/Config.in
@@ -51,6 +51,14 @@ if [ "$CONFIG_JFFS2_FS" = "y" -o "$CONFI
int 'JFFS2 debugging verbosity (0 = quiet, 2 = noisy)' CONFIG_JFFS2_FS_DEBUG 0
fi
@@ -51,6 +51,14 @@ if [ "$CONFIG_JFFS2_FS" = "y" -o "$CONFI
int 'JFFS2 debugging verbosity (0 = quiet, 2 = noisy)' CONFIG_JFFS2_FS_DEBUG 0
fi
@@
-17,10
+15,8
@@
Index: linux-2.4.35.4/fs/Config.in
bool 'Virtual memory file system support (former shm fs)' CONFIG_TMPFS
define_bool CONFIG_RAMFS y
bool 'Virtual memory file system support (former shm fs)' CONFIG_TMPFS
define_bool CONFIG_RAMFS y
-Index: linux-2.4.35.4/fs/Makefile
-===================================================================
---- linux-2.4.35.4.orig/fs/Makefile
-+++ linux-2.4.35.4/fs/Makefile
+--- a/fs/Makefile
++++ b/fs/Makefile
@@ -65,6 +65,7 @@ subdir-$(CONFIG_REISERFS_FS) += reiserfs
subdir-$(CONFIG_DEVPTS_FS) += devpts
subdir-$(CONFIG_SUN_OPENPROMFS) += openpromfs
@@ -65,6 +65,7 @@ subdir-$(CONFIG_REISERFS_FS) += reiserfs
subdir-$(CONFIG_DEVPTS_FS) += devpts
subdir-$(CONFIG_SUN_OPENPROMFS) += openpromfs
@@
-29,10
+25,8
@@
Index: linux-2.4.35.4/fs/Makefile
subdir-$(CONFIG_JFS_FS) += jfs
subdir-$(CONFIG_XFS_FS) += xfs
subdir-$(CONFIG_JFS_FS) += jfs
subdir-$(CONFIG_XFS_FS) += xfs
-Index: linux-2.4.35.4/fs/squashfs/inode.c
-===================================================================
--- /dev/null
--- /dev/null
-+++
linux-2.4.35.4
/fs/squashfs/inode.c
++++
b
/fs/squashfs/inode.c
@@ -0,0 +1,2028 @@
+/*
+ * Squashfs - a compressed read only filesystem for Linux
@@ -0,0 +1,2028 @@
+/*
+ * Squashfs - a compressed read only filesystem for Linux
@@
-2062,10
+2056,8
@@
Index: linux-2.4.35.4/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.4.35.4/fs/squashfs/Makefile
-===================================================================
--- /dev/null
--- /dev/null
-+++
linux-2.4.35.4
/fs/squashfs/Makefile
++++
b
/fs/squashfs/Makefile
@@ -0,0 +1,11 @@
+#
+# Makefile for the linux squashfs routines.
@@ -0,0 +1,11 @@
+#
+# Makefile for the linux squashfs routines.
@@
-2078,10
+2070,8
@@
Index: linux-2.4.35.4/fs/squashfs/Makefile
+obj-m := $(O_TARGET)
+
+include $(TOPDIR)/Rules.make
+obj-m := $(O_TARGET)
+
+include $(TOPDIR)/Rules.make
-Index: linux-2.4.35.4/fs/squashfs/squashfs2_0.c
-===================================================================
--- /dev/null
--- /dev/null
-+++
linux-2.4.35.4
/fs/squashfs/squashfs2_0.c
++++
b
/fs/squashfs/squashfs2_0.c
@@ -0,0 +1,751 @@
+/*
+ * Squashfs - a compressed read only filesystem for Linux
@@ -0,0 +1,751 @@
+/*
+ * Squashfs - a compressed read only filesystem for Linux
@@
-2834,10
+2824,8
@@
Index: linux-2.4.35.4/fs/squashfs/squashfs2_0.c
+
+ return 1;
+}
+
+ return 1;
+}
-Index: linux-2.4.35.4/fs/squashfs/squashfs.h
-===================================================================
--- /dev/null
--- /dev/null
-+++
linux-2.4.35.4
/fs/squashfs/squashfs.h
++++
b
/fs/squashfs/squashfs.h
@@ -0,0 +1,85 @@
+/*
+ * Squashfs - a compressed read only filesystem for Linux
@@ -0,0 +1,85 @@
+/*
+ * Squashfs - a compressed read only filesystem for Linux
@@
-2924,10
+2912,8
@@
Index: linux-2.4.35.4/fs/squashfs/squashfs.h
+ return 0;
+}
+#endif
+ return 0;
+}
+#endif
-Index: linux-2.4.35.4/include/linux/fs.h
-===================================================================
---- linux-2.4.35.4.orig/include/linux/fs.h
-+++ linux-2.4.35.4/include/linux/fs.h
+--- a/include/linux/fs.h
++++ b/include/linux/fs.h
@@ -324,6 +324,7 @@ extern void set_bh_page(struct buffer_he
#include <linux/usbdev_fs_i.h>
#include <linux/jffs2_fs_i.h>
@@ -324,6 +324,7 @@ extern void set_bh_page(struct buffer_he
#include <linux/usbdev_fs_i.h>
#include <linux/jffs2_fs_i.h>
@@
-2944,7
+2930,7
@@
Index: linux-2.4.35.4/include/linux/fs.h
void *generic_ip;
} u;
};
void *generic_ip;
} u;
};
-@@ -73
4,6 +736
,7 @@ struct nameidata {
+@@ -73
6,6 +738
,7 @@ struct nameidata {
#include <linux/usbdev_fs_sb.h>
#include <linux/cramfs_fs_sb.h>
#include <linux/jffs2_fs_sb.h>
#include <linux/usbdev_fs_sb.h>
#include <linux/cramfs_fs_sb.h>
#include <linux/jffs2_fs_sb.h>
@@
-2952,7
+2938,7
@@
Index: linux-2.4.35.4/include/linux/fs.h
extern struct list_head super_blocks;
extern spinlock_t sb_lock;
extern struct list_head super_blocks;
extern spinlock_t sb_lock;
-@@ -79
3,6 +796
,7 @@ struct super_block {
+@@ -79
5,6 +798
,7 @@ struct super_block {
struct usbdev_sb_info usbdevfs_sb;
struct jffs2_sb_info jffs2_sb;
struct cramfs_sb_info cramfs_sb;
struct usbdev_sb_info usbdevfs_sb;
struct jffs2_sb_info jffs2_sb;
struct cramfs_sb_info cramfs_sb;
@@
-2960,10
+2946,8
@@
Index: linux-2.4.35.4/include/linux/fs.h
void *generic_sbp;
} u;
/*
void *generic_sbp;
} u;
/*
-Index: linux-2.4.35.4/include/linux/squashfs_fs.h
-===================================================================
--- /dev/null
--- /dev/null
-+++
linux-2.4.35.4
/include/linux/squashfs_fs.h
++++
b
/include/linux/squashfs_fs.h
@@ -0,0 +1,915 @@
+#ifndef SQUASHFS_FS
+#define SQUASHFS_FS
@@ -0,0 +1,915 @@
+#ifndef SQUASHFS_FS
+#define SQUASHFS_FS
@@
-3880,10
+3864,8
@@
Index: linux-2.4.35.4/include/linux/squashfs_fs.h
+
+#endif
+#endif
+
+#endif
+#endif
-Index: linux-2.4.35.4/include/linux/squashfs_fs_i.h
-===================================================================
--- /dev/null
--- /dev/null
-+++
linux-2.4.35.4
/include/linux/squashfs_fs_i.h
++++
b
/include/linux/squashfs_fs_i.h
@@ -0,0 +1,44 @@
+#ifndef SQUASHFS_FS_I
+#define SQUASHFS_FS_I
@@ -0,0 +1,44 @@
+#ifndef SQUASHFS_FS_I
+#define SQUASHFS_FS_I
@@
-3929,10
+3911,8
@@
Index: linux-2.4.35.4/include/linux/squashfs_fs_i.h
+ } u;
+};
+#endif
+ } u;
+};
+#endif
-Index: linux-2.4.35.4/include/linux/squashfs_fs_sb.h
-===================================================================
--- /dev/null
--- /dev/null
-+++
linux-2.4.35.4
/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
@@
-4008,11
+3988,9
@@
Index: linux-2.4.35.4/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.4.35.4/init/do_mounts.c
-===================================================================
---- linux-2.4.35.4.orig/init/do_mounts.c
-+++ linux-2.4.35.4/init/do_mounts.c
-@@ -15,6 +15,7 @@
+--- a/init/do_mounts.c
++++ b/init/do_mounts.c
+@@ -16,6 +16,7 @@
#include <linux/minix_fs.h>
#include <linux/ext2_fs.h>
#include <linux/romfs_fs.h>
#include <linux/minix_fs.h>
#include <linux/ext2_fs.h>
#include <linux/romfs_fs.h>
@@
-4020,7
+3998,7
@@
Index: linux-2.4.35.4/init/do_mounts.c
#include <linux/cramfs_fs.h>
#define BUILD_CRAMDISK
#include <linux/cramfs_fs.h>
#define BUILD_CRAMDISK
-@@ -4
76,6 +477
,7 @@ static int __init crd_load(int in_fd, in
+@@ -4
85,6 +486
,7 @@ static int __init crd_load(int in_fd, in
* minix
* ext2
* romfs
* minix
* ext2
* romfs
@@
-4028,7
+4006,7
@@
Index: linux-2.4.35.4/init/do_mounts.c
* cramfs
* gzip
*/
* cramfs
* gzip
*/
-@@ -4
86,6 +488
,7 @@ identify_ramdisk_image(int fd, int start
+@@ -4
95,6 +497
,7 @@ identify_ramdisk_image(int fd, int start
struct minix_super_block *minixsb;
struct ext2_super_block *ext2sb;
struct romfs_super_block *romfsb;
struct minix_super_block *minixsb;
struct ext2_super_block *ext2sb;
struct romfs_super_block *romfsb;
@@
-4036,7
+4014,7
@@
Index: linux-2.4.35.4/init/do_mounts.c
struct cramfs_super *cramfsb;
int nblocks = -1;
unsigned char *buf;
struct cramfs_super *cramfsb;
int nblocks = -1;
unsigned char *buf;
-@@ -
497,6 +500
,7 @@ identify_ramdisk_image(int fd, int start
+@@ -
506,6 +509
,7 @@ identify_ramdisk_image(int fd, int start
minixsb = (struct minix_super_block *) buf;
ext2sb = (struct ext2_super_block *) buf;
romfsb = (struct romfs_super_block *) buf;
minixsb = (struct minix_super_block *) buf;
ext2sb = (struct ext2_super_block *) buf;
romfsb = (struct romfs_super_block *) buf;
@@
-4044,7
+4022,7
@@
Index: linux-2.4.35.4/init/do_mounts.c
cramfsb = (struct cramfs_super *) buf;
memset(buf, 0xe5, size);
cramfsb = (struct cramfs_super *) buf;
memset(buf, 0xe5, size);
-@@ -5
35,6 +539
,15 @@ identify_ramdisk_image(int fd, int start
+@@ -5
44,6 +548
,15 @@ identify_ramdisk_image(int fd, int start
goto done;
}
goto done;
}
@@
-4060,10
+4038,8
@@
Index: linux-2.4.35.4/init/do_mounts.c
/*
* Read block 1 to test for minix and ext2 superblock
*/
/*
* Read block 1 to test for minix and ext2 superblock
*/
-Index: linux-2.4.35.4/lib/Config.in
-===================================================================
---- linux-2.4.35.4.orig/lib/Config.in
-+++ linux-2.4.35.4/lib/Config.in
+--- a/lib/Config.in
++++ b/lib/Config.in
@@ -10,6 +10,7 @@ tristate 'CRC32 functions' CONFIG_CRC32
# Do we need the compression support?
#
@@ -10,6 +10,7 @@ tristate 'CRC32 functions' CONFIG_CRC32
# Do we need the compression support?
#
This page took
0.032362 seconds
and
4
git commands to generate.