2001-10-26 09:39:11

by Jeff Garzik

[permalink] [raw]
Subject: PATCH 2.4.14.2: more inflate_fs build fixes

--- /home/jgarzik/tmp/linux-2.4.14-pre2/fs/Config.in Thu Oct 4 18:13:18 2001
+++ linux_2_4/fs/Config.in Fri Oct 26 05:41:53 2001
@@ -128,6 +128,24 @@
define_bool CONFIG_SMB_FS n
fi

+#
+# Do we need the compression support?
+#
+if [ "$CONFIG_ZISOFS" = "y" ]; then
+ define_tristate CONFIG_ZISOFS_FS $CONFIG_ISO9660_FS
+else
+ define_tristate CONFIG_ZISOFS_FS n
+fi
+if [ "$CONFIG_CRAMFS" = "y" -o "$CONFIG_ZISOFS_FS" = "y" ]; then
+ define_tristate CONFIG_ZLIB_FS_INFLATE y
+else
+ if [ "$CONFIG_CRAMFS" = "m" -o "$CONFIG_ZISOFS_FS" = "m" ]; then
+ define_tristate CONFIG_ZLIB_FS_INFLATE m
+ else
+ define_tristate CONFIG_ZLIB_FS_INFLATE n
+ fi
+fi
+
mainmenu_option next_comment
comment 'Partition Types'
source fs/partitions/Config.in
--- /home/jgarzik/tmp/linux-2.4.14-pre2/fs/Makefile Thu Oct 4 18:13:18 2001
+++ linux_2_4/fs/Makefile Fri Oct 26 05:41:53 2001
@@ -27,6 +27,7 @@

# Do not add any filesystems before this line
subdir-$(CONFIG_EXT2_FS) += ext2
+subdir-$(CONFIG_ZLIB_FS_INFLATE) += inflate_fs
subdir-$(CONFIG_CRAMFS) += cramfs
subdir-$(CONFIG_RAMFS) += ramfs
subdir-$(CONFIG_CODA_FS) += coda


Attachments:
inflate-fs-2.4.14.2.patch (1.12 kB)

2001-10-26 14:17:21

by Alan

[permalink] [raw]
Subject: Re: PATCH 2.4.14.2: more inflate_fs build fixes

> This is required also, in order to build cramfs or zisofs in
> 2.4.14-pre2.

I was going to send Linus that too after I grabbed pre2 - thanks.

Alan

2001-10-26 16:36:11

by H. Peter Anvin

[permalink] [raw]
Subject: Re: PATCH 2.4.14.2: more inflate_fs build fixes

Followup to: <[email protected]>
By author: Alan Cox <[email protected]>
In newsgroup: linux.dev.kernel
>
> > This is required also, in order to build cramfs or zisofs in
> > 2.4.14-pre2.
>
> I was going to send Linus that too after I grabbed pre2 - thanks.
>
> Alan
>

Also, grab_cache_page_nowait() [mm/filemap.c] is missing in -pre2, so
zisofs still won't build without it. I will look at the new mm code
and try to determine how applicable the code I have is; if not, I
might end up having to contact Andrea for some tips.

-hpa

--
<[email protected]> at work, <[email protected]> in private!
"Unix gives you enough rope to shoot yourself in the foot."
http://www.zytor.com/~hpa/puzzle.txt