X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=copy-builtin;h=1dcfcb961ee8025d08e0d842affb2f05da1f9edd;hb=6ce7b2d9ad760e3aa0a2185b1c7435c37d284cd8;hp=d04314bb362f0350fa6a748173507dd07d361651;hpb=06480b2790e4a07fefa5a2bbaaf1e26d1eb00d33;p=mirror_zfs.git

diff --git a/copy-builtin b/copy-builtin
index d04314bb3..1dcfcb961 100755
--- a/copy-builtin
+++ b/copy-builtin
@@ -12,9 +12,11 @@ usage()
 KERNEL_DIR="$(readlink --canonicalize-existing "$1")"
 
 MODULES=()
+MODULES+="spl"
 for MODULE_DIR in module/*
 do
 	[ -d "$MODULE_DIR" ] || continue
+	[ "spl" = "${MODULE_DIR##*/}" ] && continue
 	MODULES+=("${MODULE_DIR##*/}")
 done
 
@@ -28,11 +30,12 @@ then
 fi
 
 make clean || true
+scripts/make_gitrev.sh || true
 
 rm -rf "$KERNEL_DIR/include/zfs" "$KERNEL_DIR/fs/zfs"
 cp --recursive include "$KERNEL_DIR/include/zfs"
 cp --recursive module "$KERNEL_DIR/fs/zfs"
-cp zfs_config.h "$KERNEL_DIR/"
+cp zfs_config.h "$KERNEL_DIR/include/zfs/"
 
 for MODULE in "${MODULES[@]}"
 do
@@ -43,7 +46,6 @@ done
 cat > "$KERNEL_DIR/fs/zfs/Kconfig" <<"EOF"
 config ZFS
 	tristate "ZFS filesystem support"
-	depends on SPL
 	depends on EFI_PARTITION
 	select ZLIB_INFLATE
 	select ZLIB_DEFLATE
@@ -60,11 +62,12 @@ EOF
 {
 	cat <<-"EOF"
 	ZFS_MODULE_CFLAGS  = -I$(srctree)/include/zfs
-	ZFS_MODULE_CFLAGS += -I$(srctree)/include/spl
-	ZFS_MODULE_CFLAGS += -include $(srctree)/spl_config.h
-	ZFS_MODULE_CFLAGS += -include $(srctree)/zfs_config.h
-	ZFS_MODULE_CLFAGS += -std=gnu99
-	export ZFS_MODULE_CFLAGS
+	ZFS_MODULE_CFLAGS += -I$(srctree)/include/zfs/spl
+	ZFS_MODULE_CFLAGS += -include $(srctree)/include/zfs/zfs_config.h
+	ZFS_MODULE_CFLAGS += -std=gnu99 -Wno-declaration-after-statement
+	ZFS_MODULE_CPPFLAGS  = -D_KERNEL
+	ZFS_MODULE_CPPFLAGS += -UDEBUG -DNDEBUG
+	export ZFS_MODULE_CFLAGS ZFS_MODULE_CPPFLAGS
 
 	obj-$(CONFIG_ZFS) :=
 	EOF