X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=copy-builtin;h=34c482bab697cf1672617e79a9a19940c46a9804;hb=ca9126689c369dddb989b1999a1bb285bdf798ce;hp=3277270d92e808ab54700443427c142cf53623ce;hpb=dc614e90dac9bcd31a9ffb1c5dd0a55f235096ba;p=mirror_spl-debian.git

diff --git a/copy-builtin b/copy-builtin
index 3277270..34c482b 100755
--- a/copy-builtin
+++ b/copy-builtin
@@ -33,6 +33,7 @@ rm -rf "$KERNEL_DIR/include/spl" "$KERNEL_DIR/spl"
 cp --recursive include "$KERNEL_DIR/include/spl"
 cp --recursive module "$KERNEL_DIR/spl"
 cp spl_config.h "$KERNEL_DIR/"
+cp spl.release.in "$KERNEL_DIR/"
 
 adjust_obj_paths()
 {
@@ -55,6 +56,8 @@ adjust_obj_paths()
 for MODULE in "${MODULES[@]}"
 do
 	adjust_obj_paths "$KERNEL_DIR/spl/$MODULE/Makefile"
+	sed -i.bak '/obj =/d' "$KERNEL_DIR/spl/$MODULE/Makefile"
+	sed -i.bak '/src =/d' "$KERNEL_DIR/spl/$MODULE/Makefile"
 done
 
 cat > "$KERNEL_DIR/spl/Kconfig" <<"EOF"
@@ -111,8 +114,9 @@ add_after()
 }
 
 add_after "$KERNEL_DIR/Kconfig" 'source "arch/$SRCARCH/Kconfig"' 'source "spl/Kconfig"'
-# We must take care to build SPL before ZFS, else module initialization order will be wrong
-sed -i 's#kernel/ mm/ fs/#kernel/ mm/ spl/ fs/#' "$KERNEL_DIR/Makefile"
+# We must take care to build SPL before ZFS, otherwise the symbols required
+# to link ZFS will not be available.
+sed -i 's~mm/ fs/~mm/ spl/ fs/~' "$KERNEL_DIR/Makefile"
 
 echo >&2
 echo "    $0: done." >&2