]>
Commit | Line | Data |
---|---|---|
bbc34646 | 1 | --- squashfs1.0c/squashfs-patch.org Wed Oct 30 01:34:58 2002 |
2 | +++ squashfs1.0c/squashfs-patch Thu Oct 31 08:58:31 2002 | |
3 | @@ -26,13 +26,13 @@ | |
4 | --- linux-2.4.19/fs/Makefile Mon Feb 25 19:38:07 2002 | |
5 | +++ linux/fs/Makefile Wed Oct 30 00:26:09 2002 | |
6 | @@ -67,6 +67,7 @@ | |
7 | - subdir-$(CONFIG_REISERFS_FS) += reiserfs | |
8 | - subdir-$(CONFIG_DEVPTS_FS) += devpts | |
9 | subdir-$(CONFIG_SUN_OPENPROMFS) += openpromfs | |
10 | + subdir-$(CONFIG_XFS_FS) += xfs | |
11 | + subdir-$(CONFIG_JFS_FS) += jfs | |
12 | +subdir-$(CONFIG_SQUASHFS) += squashfs | |
13 | ||
14 | - | |
15 | obj-$(CONFIG_BINFMT_AOUT) += binfmt_aout.o | |
16 | + obj-$(CONFIG_BINFMT_XOUT) += binfmt_xout.o | |
17 | diff --new-file -ur linux-2.4.19/fs/squashfs/Makefile linux/fs/squashfs/Makefile | |
18 | --- linux-2.4.19/fs/squashfs/Makefile Thu Jan 1 01:00:00 1970 | |
19 | +++ linux/fs/squashfs/Makefile Wed Oct 30 00:26:09 2002 | |
6b7785eb | 20 | --- squashfs1.0c/squashfs-patch.org Wed Dec 4 09:35:09 2002 |
21 | +++ squashfs1.0c/squashfs-patch Wed Dec 4 09:43:47 2002 | |
22 | @@ -9,19 +9,6 @@ | |
23 | bool 'Virtual memory file system support (former shm fs)' CONFIG_TMPFS | |
24 | define_bool CONFIG_RAMFS y | |
25 | ||
26 | -@@ -146,10 +147,10 @@ | |
27 | - else | |
28 | - define_tristate CONFIG_ZISOFS_FS n | |
29 | - fi | |
30 | --if [ "$CONFIG_CRAMFS" = "y" -o "$CONFIG_ZISOFS_FS" = "y" ]; then | |
31 | -+if [ "$CONFIG_CRAMFS" = "y" -o "$CONFIG_ZISOFS_FS" = "y" -o $CONFIG_SQUASHFS = "y" ]; then | |
32 | - define_tristate CONFIG_ZLIB_FS_INFLATE y | |
33 | - else | |
34 | -- if [ "$CONFIG_CRAMFS" = "m" -o "$CONFIG_ZISOFS_FS" = "m" ]; then | |
35 | -+ if [ "$CONFIG_CRAMFS" = "m" -o "$CONFIG_ZISOFS_FS" = "m" -o $CONFIG_SQUASHFS = "m" ]; then | |
36 | - define_tristate CONFIG_ZLIB_FS_INFLATE m | |
37 | - else | |
38 | - define_tristate CONFIG_ZLIB_FS_INFLATE n | |
39 | diff --new-file -ur linux-2.4.19/fs/Makefile linux/fs/Makefile | |
40 | --- linux-2.4.19/fs/Makefile Mon Feb 25 19:38:07 2002 | |
41 | +++ linux/fs/Makefile Wed Oct 30 00:26:09 2002 |