From d7d0752a183741f69920170a89e8ccc8d80b00c3 Mon Sep 17 00:00:00 2001 From: Michael D Labriola Date: Tue, 20 Oct 2020 13:56:23 -0700 Subject: [PATCH] copy-builtin: make sure kernel Makefiles don't look in zfs source tree The icp Makefile was referencing absolute paths to the zfs source tree for include files. The result was that even though the headers get added to the Linux kernel tree, building fails if you move/remove the zfs checkout. Signed-off-by: Michael D Labriola --- copy-builtin | 1 + 1 file changed, 1 insertion(+) diff --git a/copy-builtin b/copy-builtin index f0bcb098cd..84f469fef0 100755 --- a/copy-builtin +++ b/copy-builtin @@ -42,6 +42,7 @@ for MODULE in "${MODULES[@]}" do sed -i '/obj =/d' "$KERNEL_DIR/fs/zfs/$MODULE/Makefile" sed -i '/src =/d' "$KERNEL_DIR/fs/zfs/$MODULE/Makefile" + sed -i "s|-I$PWD/module/|-I\$(srctree)/fs/zfs/|" "$KERNEL_DIR/fs/zfs/$MODULE/Makefile" done cat > "$KERNEL_DIR/fs/zfs/Kconfig" <<"EOF"