update/rebase to spl-0.7.11 with patches from ZOL
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
parent
aa7ac7c184
commit
ea3522b2f7
57
spl-patches/0006-Linux-4.18-compat-Kconfig.patch
Normal file
57
spl-patches/0006-Linux-4.18-compat-Kconfig.patch
Normal file
@ -0,0 +1,57 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Brian Behlendorf <behlendorf1@llnl.gov>
|
||||||
|
Date: Wed, 12 Sep 2018 20:42:34 -0400
|
||||||
|
Subject: [PATCH] Linux 4.18 compat: Kconfig
|
||||||
|
|
||||||
|
The kernel's top level Kconfig was updated in 4.18 such that it
|
||||||
|
no longer matches the expected pattern preventing the spl source
|
||||||
|
from being inserted. Simplify the existing logic to always insert
|
||||||
|
the entry at the end of the file since an exact location is not
|
||||||
|
required, unlike in the Makefile.
|
||||||
|
|
||||||
|
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
|
||||||
|
Issue #7890
|
||||||
|
|
||||||
|
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
||||||
|
---
|
||||||
|
copy-builtin | 27 +--------------------------
|
||||||
|
1 file changed, 1 insertion(+), 26 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/copy-builtin b/copy-builtin
|
||||||
|
index 34c482b..b8e3a08 100755
|
||||||
|
--- a/copy-builtin
|
||||||
|
+++ b/copy-builtin
|
||||||
|
@@ -88,32 +88,7 @@ EOF
|
||||||
|
done
|
||||||
|
} > "$KERNEL_DIR/spl/Kbuild"
|
||||||
|
|
||||||
|
-add_after()
|
||||||
|
-{
|
||||||
|
- local FILE="$1"
|
||||||
|
- local MARKER="$2"
|
||||||
|
- local NEW="$3"
|
||||||
|
- local LINE
|
||||||
|
-
|
||||||
|
- while IFS='' read -r LINE
|
||||||
|
- do
|
||||||
|
- echo "$LINE"
|
||||||
|
-
|
||||||
|
- if [ -n "$MARKER" -a "$LINE" = "$MARKER" ]
|
||||||
|
- then
|
||||||
|
- echo "$NEW"
|
||||||
|
- MARKER=''
|
||||||
|
- if IFS='' read -r LINE
|
||||||
|
- then
|
||||||
|
- [ "$LINE" != "$NEW" ] && echo "$LINE"
|
||||||
|
- fi
|
||||||
|
- fi
|
||||||
|
- done < "$FILE" > "$FILE.new"
|
||||||
|
-
|
||||||
|
- mv "$FILE.new" "$FILE"
|
||||||
|
-}
|
||||||
|
-
|
||||||
|
-add_after "$KERNEL_DIR/Kconfig" 'source "arch/$SRCARCH/Kconfig"' 'source "spl/Kconfig"'
|
||||||
|
+echo 'source "spl/Kconfig"' >>"$KERNEL_DIR/Kconfig"
|
||||||
|
# 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"
|
56
spl-patches/0007-Tag-spl-0.7.11.patch
Normal file
56
spl-patches/0007-Tag-spl-0.7.11.patch
Normal file
@ -0,0 +1,56 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Tony Hutter <hutter2@llnl.gov>
|
||||||
|
Date: Thu, 13 Sep 2018 10:13:33 -0700
|
||||||
|
Subject: [PATCH] Tag spl-0.7.11
|
||||||
|
|
||||||
|
META file and changelog updated.
|
||||||
|
|
||||||
|
Signed-off-by: Tony Hutter <hutter2@llnl.gov>
|
||||||
|
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
||||||
|
---
|
||||||
|
META | 2 +-
|
||||||
|
rpm/generic/spl-kmod.spec.in | 3 +++
|
||||||
|
rpm/generic/spl.spec.in | 3 +++
|
||||||
|
3 files changed, 7 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/META b/META
|
||||||
|
index 7818d34..fc98597 100644
|
||||||
|
--- a/META
|
||||||
|
+++ b/META
|
||||||
|
@@ -1,7 +1,7 @@
|
||||||
|
Meta: 1
|
||||||
|
Name: spl
|
||||||
|
Branch: 1.0
|
||||||
|
-Version: 0.7.10
|
||||||
|
+Version: 0.7.11
|
||||||
|
Release: 1
|
||||||
|
Release-Tags: relext
|
||||||
|
License: GPL
|
||||||
|
diff --git a/rpm/generic/spl-kmod.spec.in b/rpm/generic/spl-kmod.spec.in
|
||||||
|
index f31e31e..4cc1faf 100644
|
||||||
|
--- a/rpm/generic/spl-kmod.spec.in
|
||||||
|
+++ b/rpm/generic/spl-kmod.spec.in
|
||||||
|
@@ -167,6 +167,9 @@ chmod u+x ${RPM_BUILD_ROOT}%{kmodinstdir_prefix}/*/extra/*/*/*
|
||||||
|
rm -rf $RPM_BUILD_ROOT
|
||||||
|
|
||||||
|
%changelog
|
||||||
|
+* Thu Sep 13 2018 Tony Hutter <hutter2@llnl.gov> - 0.7.11-1
|
||||||
|
+- Released 0.7.11-1, detailed release notes are available at:
|
||||||
|
+- https://github.com/zfsonlinux/zfs/releases/tag/zfs-0.7.11
|
||||||
|
* Wed Sep 05 2018 Tony Hutter <hutter2@llnl.gov> - 0.7.10-1
|
||||||
|
- Released 0.7.10-1, detailed release notes are available at:
|
||||||
|
- https://github.com/zfsonlinux/zfs/releases/tag/zfs-0.7.10
|
||||||
|
diff --git a/rpm/generic/spl.spec.in b/rpm/generic/spl.spec.in
|
||||||
|
index 7e9ee12..4b3a3d7 100644
|
||||||
|
--- a/rpm/generic/spl.spec.in
|
||||||
|
+++ b/rpm/generic/spl.spec.in
|
||||||
|
@@ -44,6 +44,9 @@ make install DESTDIR=%{?buildroot}
|
||||||
|
%{_mandir}/man5/*
|
||||||
|
|
||||||
|
%changelog
|
||||||
|
+* Thu Sep 13 2018 Tony Hutter <hutter2@llnl.gov> - 0.7.11-1
|
||||||
|
+- Released 0.7.11-1, detailed release notes are available at:
|
||||||
|
+- https://github.com/zfsonlinux/zfs/releases/tag/zfs-0.7.11
|
||||||
|
* Wed Sep 05 2018 Tony Hutter <hutter2@llnl.gov> - 0.7.10-1
|
||||||
|
- Released 0.7.10-1, detailed release notes are available at:
|
||||||
|
- https://github.com/zfsonlinux/zfs/releases/tag/zfs-0.7.10
|
@ -3,3 +3,5 @@
|
|||||||
0003-Add-pool-state-proc-entry-SUSPENDED-pools-SPL.patch
|
0003-Add-pool-state-proc-entry-SUSPENDED-pools-SPL.patch
|
||||||
0004-Add-rwsem_tryupgrade-for-4.9.20-rt16-kernel-SPL.patch
|
0004-Add-rwsem_tryupgrade-for-4.9.20-rt16-kernel-SPL.patch
|
||||||
0005-Tag-spl-0.7.10.patch
|
0005-Tag-spl-0.7.10.patch
|
||||||
|
0006-Linux-4.18-compat-Kconfig.patch
|
||||||
|
0007-Tag-spl-0.7.11.patch
|
||||||
|
Loading…
Reference in New Issue
Block a user