Skip to contentSkip to conversation

PATCH 2.4.14.2: more inflate_fs build fixes

PATCH Jeff Garzik 3 participants 3 messages Oct 26, 2001 VFS

lore
Share & tools
lore
#0 lore raw

oops. I forgot to send this part, which is missing also.

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

Signature · 3 lines
Jeff Garzik      | Only so many songs can be sung
Building 1024    | with two lips, two lungs, and one tongue.
MandrakeSoft     |         - nomeansno
fs/Config.in renamed from home/jgarzik/tmp/linux-2.4.14-pre2/fs/Config.in +18 -0
@@ -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
fs/Makefile renamed from home/jgarzik/tmp/linux-2.4.14-pre2/fs/Makefile +1 -0
@@ -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
#1 lore raw
Quoted 2 lines

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

#2 lore raw
In reply to Jeff Garzik
Followup to:  <[email protected]>
By author:    Alan Cox <[email protected]>
In newsgroup: linux.dev.kernel
Quoted 8 lines
Quoted 3 lines

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

Signature · 3 lines
<[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