From ed50d895d05ab8067c3063c1b46e3f2187a79a75 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Fabian=20Gr=C3=BCnbichler?= Date: Wed, 21 Feb 2018 09:30:05 +0100 Subject: [PATCH] rebase zfs patches --- ...remove-DKMS-modules-and-dracut-build.patch | 31 ++++++++--------- ...import.target-in-systemd-preset-6968.patch | 33 ------------------- ...rate.patch => 0004-Fix-ARC-hit-rate.patch} | 0 ...0005-always-load-ZFS-module-on-boot.patch} | 0 zfs-patches/series | 5 ++- 5 files changed, 18 insertions(+), 51 deletions(-) delete mode 100644 zfs-patches/0004-Enable-zfs-import.target-in-systemd-preset-6968.patch rename zfs-patches/{0005-Fix-ARC-hit-rate.patch => 0004-Fix-ARC-hit-rate.patch} (100%) rename zfs-patches/{0006-always-load-ZFS-module-on-boot.patch => 0005-always-load-ZFS-module-on-boot.patch} (100%) diff --git a/zfs-patches/0001-remove-DKMS-modules-and-dracut-build.patch b/zfs-patches/0001-remove-DKMS-modules-and-dracut-build.patch index e19d1e1..db413ac 100644 --- a/zfs-patches/0001-remove-DKMS-modules-and-dracut-build.patch +++ b/zfs-patches/0001-remove-DKMS-modules-and-dracut-build.patch @@ -8,14 +8,14 @@ Content-Transfer-Encoding: 8bit Signed-off-by: Fabian Grünbichler --- - debian/control.in | 36 +++--------------- + debian/control.in | 37 +++--------------- debian/control | 1 - debian/not-installed | 1 + debian/rules | 105 +-------------------------------------------------- - 4 files changed, 8 insertions(+), 135 deletions(-) + 4 files changed, 8 insertions(+), 136 deletions(-) diff --git a/debian/control.in b/debian/control.in -index 771fc3a80..edfed470f 100644 +index b3ef99870..8e69b6e37 100644 --- a/debian/control.in +++ b/debian/control.in @@ -8,7 +8,6 @@ Uploaders: Aron Xu , @@ -34,7 +34,7 @@ index 771fc3a80..edfed470f 100644 -Architecture: all -Pre-Depends: spl-dkms (>= ${source:Upstream-Version}), spl-dkms (<<${source:Upstream-Version}.) -Depends: dkms (>> 2.1.1.2-5), lsb-release, ${misc:Depends} --Recommends: zfsutils-linux, zfs-zed +-Recommends: zfsutils-linux (>= ${binary:Version}), zfs-zed -Provides: zfs-modules -Description: OpenZFS filesystem kernel modules for Linux - The Z file system is a pooled filesystem designed for maximum data @@ -48,18 +48,18 @@ index 771fc3a80..edfed470f 100644 Architecture: all Depends: initramfs-tools, busybox-initramfs | busybox-static | busybox, -- zfs-modules | zfs-dkms, zfsutils-linux, -+ zfsutils-linux, +- zfs-modules | zfs-dkms, zfsutils-linux (>= ${binary:Version}), ++ zfsutils-linux (>= ${binary:Version}), ${misc:Depends} Description: OpenZFS root filesystem capabilities for Linux - initramfs The Z file system is a pooled filesystem designed for maximum data -@@ -112,23 +97,12 @@ Description: OpenZFS root filesystem capabilities for Linux - initramfs +@@ -112,24 +97,12 @@ Description: OpenZFS root filesystem capabilities for Linux - initramfs This package adds OpenZFS to the system initramfs with a hook for the initramfs-tools infrastructure. -Package: zfs-dracut -Architecture: all --Depends: dracut, zfs-modules | zfs-dkms, zfsutils-linux, ${misc:Depends} +-Depends: dracut, zfs-modules | zfs-dkms, zfsutils-linux (>= ${binary:Version}), ${misc:Depends} -Description: OpenZFS root filesystem capabilities for Linux - dracut - The Z file system is a pooled filesystem designed for maximum data - integrity, supporting data snapshots, multiple copies, and data @@ -73,32 +73,33 @@ index 771fc3a80..edfed470f 100644 Architecture: linux-any Depends: ${misc:Depends}, ${shlibs:Depends}, ${python3:Depends}, python3 -Recommends: lsb-base, zfs-modules | zfs-dkms, zfs-zed +-Breaks: zfs-dkms (>> ${binary:Version}), zfs-dkms (<< ${binary:Version}) -Suggests: nfs-kernel-server, samba-common-bin (>= 3.0.23), zfs-initramfs | zfs-dracut +Recommends: lsb-base, zfs-zed +Suggests: nfs-kernel-server, samba-common-bin (>= 3.0.23), zfs-initramfs Conflicts: zfs, zfs-fuse, zutils Provides: zfsutils Description: command-line tools to manage OpenZFS filesystems -@@ -142,7 +116,7 @@ Description: command-line tools to manage OpenZFS filesystems +@@ -143,7 +116,7 @@ Description: command-line tools to manage OpenZFS filesystems Package: zfs-zed Section: contrib/admin Architecture: linux-any --Depends: ${misc:Depends}, ${shlibs:Depends}, zfs-modules | zfs-dkms, zfsutils-linux -+Depends: ${misc:Depends}, ${shlibs:Depends}, zfsutils-linux +-Depends: ${misc:Depends}, ${shlibs:Depends}, zfs-modules | zfs-dkms, zfsutils-linux (>= ${binary:Version}) ++Depends: ${misc:Depends}, ${shlibs:Depends}, zfsutils-linux (>= ${binary:Version}) Description: OpenZFS Event Daemon The Z file system is a pooled filesystem designed for maximum data integrity, supporting data snapshots, multiple copies, and data -@@ -153,7 +127,7 @@ Description: OpenZFS Event Daemon +@@ -154,7 +127,7 @@ Description: OpenZFS Event Daemon Package: zfs-test Section: contrib/admin Architecture: linux-any --Depends: ${misc:Depends}, ${shlibs:Depends}, zfs-modules | zfs-dkms, zfsutils-linux, parted, lsscsi, mdadm, bc, ksh, fio, acl, sudo, sysstat, python -+Depends: ${misc:Depends}, ${shlibs:Depends}, zfsutils-linux, parted, lsscsi, mdadm, bc, ksh, fio, acl, sudo, sysstat, python +-Depends: ${misc:Depends}, ${shlibs:Depends}, zfs-modules | zfs-dkms, zfsutils-linux (>=${binary:Version}), parted, lsscsi, mdadm, bc, ksh, fio, acl, sudo, sysstat, python ++Depends: ${misc:Depends}, ${shlibs:Depends}, zfsutils-linux (>=${binary:Version}), parted, lsscsi, mdadm, bc, ksh, fio, acl, sudo, sysstat, python Breaks: zfsutils-linux (<= 0.6.5.11-1) Replaces: zfsutils-linux (<= 0.6.5.11-1) Description: OpenZFS test infrastructure an support scripts diff --git a/debian/control b/debian/control -index 771fc3a80..be0b90337 100644 +index b3ef99870..816403e44 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,6 @@ Uploaders: Aron Xu , diff --git a/zfs-patches/0004-Enable-zfs-import.target-in-systemd-preset-6968.patch b/zfs-patches/0004-Enable-zfs-import.target-in-systemd-preset-6968.patch deleted file mode 100644 index d06fab8..0000000 --- a/zfs-patches/0004-Enable-zfs-import.target-in-systemd-preset-6968.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Antonio Russo -Date: Mon, 18 Dec 2017 12:43:55 -0500 -Subject: [PATCH] Enable zfs-import.target in systemd preset (#6968) -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Cherry picked line from PR #6822, this enables the new -target introduced in PR #6764. - -Signed-off-by: Antonio Russo -(cherry picked from commit da16fc5739b1962b3d357246938d2df06d6a1075) -Signed-off-by: Fabian Grünbichler ---- - etc/systemd/system/50-zfs.preset.in | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/etc/systemd/system/50-zfs.preset.in b/etc/systemd/system/50-zfs.preset.in -index 4d82778e3..884a69b5b 100644 ---- a/etc/systemd/system/50-zfs.preset.in -+++ b/etc/systemd/system/50-zfs.preset.in -@@ -1,6 +1,7 @@ - # ZFS is enabled by default - enable zfs-import-cache.service - disable zfs-import-scan.service -+enable zfs-import.target - enable zfs-mount.service - enable zfs-share.service - enable zfs-zed.service --- -2.14.2 - diff --git a/zfs-patches/0005-Fix-ARC-hit-rate.patch b/zfs-patches/0004-Fix-ARC-hit-rate.patch similarity index 100% rename from zfs-patches/0005-Fix-ARC-hit-rate.patch rename to zfs-patches/0004-Fix-ARC-hit-rate.patch diff --git a/zfs-patches/0006-always-load-ZFS-module-on-boot.patch b/zfs-patches/0005-always-load-ZFS-module-on-boot.patch similarity index 100% rename from zfs-patches/0006-always-load-ZFS-module-on-boot.patch rename to zfs-patches/0005-always-load-ZFS-module-on-boot.patch diff --git a/zfs-patches/series b/zfs-patches/series index 578144f..2a1a557 100644 --- a/zfs-patches/series +++ b/zfs-patches/series @@ -1,6 +1,5 @@ 0001-remove-DKMS-modules-and-dracut-build.patch 0002-import-with-d-dev-disk-by-id-in-scan-service.patch 0003-Use-user-namespaces-for-FSETID-policy-check.patch -0004-Enable-zfs-import.target-in-systemd-preset-6968.patch -0005-Fix-ARC-hit-rate.patch -0006-always-load-ZFS-module-on-boot.patch +0004-Fix-ARC-hit-rate.patch +0005-always-load-ZFS-module-on-boot.patch -- 2.39.2