summaryrefslogtreecommitdiffstats
path: root/copy-builtin
diff options
context:
space:
mode:
authorRichard Yao <[email protected]>2012-07-29 05:43:57 -0400
committerBrian Behlendorf <[email protected]>2012-08-06 11:47:47 -0700
commit9a512dca97fec1afa5068b53621ce1dd7dbef578 (patch)
tree18bf79c62649fe2c7de16b266c32b6898d1d7862 /copy-builtin
parent7c0e570888532b3cecf66459e55688df18946be0 (diff)
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 <[email protected]> Signed-off-by: Brian Behlendorf <[email protected]> Closes #854
Diffstat (limited to 'copy-builtin')
-rwxr-xr-xcopy-builtin3
1 files changed, 3 insertions, 0 deletions
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.