From: Richard Yao <ryao@cs.stonybrook.edu>
Date: Sun, 29 Jul 2012 09:43:57 +0000 (-0400)
Subject: Add missing dependencies to ./copy-builtin
X-Git-Tag: zfs-0.6.0-rc10~11
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9a512dca97fec1afa5068b53621ce1dd7dbef578;p=zfs

Add missing dependencies to ./copy-builtin

ZFS depends on EFI_PARTITION, ZLIB_DEFLATE and ZLIB_INFLATE, but when
ZFS is integrated with the kernel source tree, menuconfig does not
enforce these dependencies. This can cause build failures in the case of
ZLIB_DEFLATE and ZLIB_INFLATE where symbols are not found. This can also
cause runtime failures in the case of EFI_PARTITION, where the kernel
will not understand GPT partitions when creating pools from raw disks.
We solve this by making menuconfig aware of these dependencies.

Signed-off-by: Richard Yao <ryao@cs.stonybrook.edu>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #854
---

diff --git a/copy-builtin b/copy-builtin
index a053fd8a3..164e81e1a 100755
--- a/copy-builtin
+++ b/copy-builtin
@@ -61,6 +61,9 @@ cat > "$KERNEL_DIR/fs/zfs/Kconfig" <<"EOF"
 config ZFS
 	tristate "ZFS"
 	depends on SPL
+	depends on EFI_PARTITION
+	select ZLIB_INFLATE
+	select ZLIB_DEFLATE
 	help
 	  This is the ZFS filesystem from the ZFS On Linux project.