[pve-devel] [PATCH zfsonlinux 2/3] refresh patches
Fabian Grünbichler
f.gruenbichler at proxmox.com
Wed Feb 8 15:46:52 CET 2017
and manage them as rebasing patch queue branch
Signed-off-by: Fabian Grünbichler <f.gruenbichler at proxmox.com>
---
spl-patches/fix-control.patch | 14 +++++++--
...ndo-python-changes-until-PVE-5.0-release.patch} | 35 ++++++++++++----------
...002-remove-DKMS-modules-and-dracut-build.patch} | 29 +++++++++++-------
....preinst-postinst-for-wheezy-upgrade-pat.patch} | 7 ++++-
...rade-path-from-existing-PVE-ZFS-packages.patch} | 8 +++--
...rt-with-d-dev-disk-by-id-in-scan-service.patch} | 8 +++--
...=> 0006-fix-rm-path-in-zfs-share.service.patch} | 8 +++--
zfs-patches/ignore-zfs-import-error.patch | 10 -------
zfs-patches/series | 12 ++++----
9 files changed, 80 insertions(+), 51 deletions(-)
rename zfs-patches/{undo-python-changes-until-PVE-5.0.patch => 0001-Undo-python-changes-until-PVE-5.0-release.patch} (83%)
rename zfs-patches/{fix-control.patch => 0002-remove-DKMS-modules-and-dracut-build.patch} (90%)
rename zfs-patches/{add-zfsutils-preinst-postinst.patch => 0003-add-zfsutils.preinst-postinst-for-wheezy-upgrade-pat.patch} (86%)
rename zfs-patches/{fix-dependencies-for-upgrades.patch => 0004-ensure-upgrade-path-from-existing-PVE-ZFS-packages.patch} (94%)
rename zfs-patches/{import-by-disk-id.patch => 0005-import-with-d-dev-disk-by-id-in-scan-service.patch} (73%)
rename zfs-patches/{fix-rm-path-in-zfs-share-service.patch => 0006-fix-rm-path-in-zfs-share.service.patch} (71%)
delete mode 100644 zfs-patches/ignore-zfs-import-error.patch
diff --git a/spl-patches/fix-control.patch b/spl-patches/fix-control.patch
index 1c3a25a..475839f 100644
--- a/spl-patches/fix-control.patch
+++ b/spl-patches/fix-control.patch
@@ -1,11 +1,19 @@
-From 764866342a7b4090c0530953db2d9dc5ed6a3b0e Mon Sep 17 00:00:00 2001
+From b750abda7a2b24c52a4fba505571a629223ad64e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler at proxmox.com>
Date: Wed, 12 Oct 2016 10:57:39 +0200
Subject: [PATCH] remove DKMS and module build
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+Signed-off-by: Fabian Grünbichler <f.gruenbichler at proxmox.com>
---
+ debian/control.in | 24 --------------------
+ debian/rules | 68 +------------------------------------------------------
+ 2 files changed, 1 insertion(+), 91 deletions(-)
+
diff --git a/debian/control.in b/debian/control.in
-index 6392ddc..dc6ee96 100644
+index 52c1660..dc6ee96 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -8,40 +8,16 @@ Build-Depends: autogen,
@@ -21,7 +29,7 @@ index 6392ddc..dc6ee96 100644
-Package: spl-dkms
-Architecture: all
--Depends: dkms (>> 2.1.1.2-5), file, libc-dev, lsb-release, ${misc:Depends}
+-Depends: dkms (>> 2.2.1.0), file, libc-dev, lsb-release, ${misc:Depends}
-Recommends: spl (>= ${source:Upstream-Version})
-Provides: spl-modules
-Description: Solaris Porting Layer kernel modules for Linux
diff --git a/zfs-patches/undo-python-changes-until-PVE-5.0.patch b/zfs-patches/0001-Undo-python-changes-until-PVE-5.0-release.patch
similarity index 83%
rename from zfs-patches/undo-python-changes-until-PVE-5.0.patch
rename to zfs-patches/0001-Undo-python-changes-until-PVE-5.0-release.patch
index fa9568f..2c6c737 100644
--- a/zfs-patches/undo-python-changes-until-PVE-5.0.patch
+++ b/zfs-patches/0001-Undo-python-changes-until-PVE-5.0-release.patch
@@ -1,7 +1,7 @@
-From 1e12e32aa10269bf46860b11b50795833374af00 Mon Sep 17 00:00:00 2001
+From b8f3b081a866fc3d529fb2e72c425ef54c4d141d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler at proxmox.com>
Date: Wed, 11 Jan 2017 09:16:11 +0100
-Subject: [PATCH] Undo python changes until PVE 5.0 release
+Subject: [PATCH 1/6] Undo python changes until PVE 5.0 release
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
@@ -24,9 +24,9 @@ Signed-off-by: Fabian Grünbichler <f.gruenbichler at proxmox.com>
debian/patches/1001-cmd-python-exec-path.patch | 30 --------------------------
debian/control | 4 ++--
debian/patches/series | 1 -
- debian/rules | 9 +-------
+ debian/rules | 11 ++++------
debian/zfsutils-linux.install | 6 +++---
- 6 files changed, 8 insertions(+), 46 deletions(-)
+ 6 files changed, 11 insertions(+), 45 deletions(-)
delete mode 100644 debian/patches/1001-cmd-python-exec-path.patch
diff --git a/debian/control.in b/debian/control.in
@@ -110,18 +110,19 @@ index 76907e4..db75496 100644
Suggests: nfs-kernel-server, samba-common-bin (>= 3.0.23), zfs-initramfs | zfs-dracut
Conflicts: zfs, zfs-fuse, zutils
diff --git a/debian/patches/series b/debian/patches/series
-index af018e2..4ba6140 100644
+index df85d5b..0fed690 100644
--- a/debian/patches/series
+++ b/debian/patches/series
-@@ -4,6 +4,5 @@
+@@ -4,7 +4,6 @@
1000-ppc64el-endian-support.patch
1002-fix-mips-build.patch
enable-zed.patch
-1001-cmd-python-exec-path.patch
- 1003-linux-4.9-compat.patch
1004-zed-service-bindir.patch
+ 1002-Fix-dev-zfs-device-is-missing.patch
+ 0001-fix-booting-via-dracut-generated-initramfs.patch
diff --git a/debian/rules b/debian/rules
-index 15e0592..fc23f5f 100755
+index 9efbace..70e57e5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -35,7 +35,7 @@ pmodules = $(PACKAGE)-modules-$(non_epoch_version)
@@ -133,22 +134,26 @@ index 15e0592..fc23f5f 100755
override_dh_auto_configure:
@cp debian/control.in debian/control
-@@ -62,13 +62,6 @@ override_dh_auto_install:
+@@ -64,14 +64,11 @@ override_dh_auto_install:
@# Install the utilities.
$(MAKE) install DESTDIR='$(CURDIR)/debian/tmp'
-
+ # Move from bin_dir to /usr/sbin
- # Remove suffix (.py) as per policy 10.4 - Scripts
- # https://www.debian.org/doc/debian-policy/ch-files.html#s-scripts
-- mv '$(CURDIR)/debian/tmp/usr/sbin/arc_summary.py' '$(CURDIR)/debian/tmp/usr/sbin/arc_summary'
-- mv '$(CURDIR)/debian/tmp/usr/sbin/arcstat.py' '$(CURDIR)/debian/tmp/usr/sbin/arcstat'
-- mv '$(CURDIR)/debian/tmp/usr/sbin/dbufstat.py' '$(CURDIR)/debian/tmp/usr/sbin/dbufstat'
--
+ mkdir -p '$(CURDIR)/debian/tmp/usr/sbin/'
+- mv '$(CURDIR)/debian/tmp/usr/bin/arc_summary.py' '$(CURDIR)/debian/tmp/usr/sbin/arc_summary'
+- mv '$(CURDIR)/debian/tmp/usr/bin/arcstat.py' '$(CURDIR)/debian/tmp/usr/sbin/arcstat'
+- mv '$(CURDIR)/debian/tmp/usr/bin/dbufstat.py' '$(CURDIR)/debian/tmp/usr/sbin/dbufstat'
++ mv '$(CURDIR)/debian/tmp/usr/bin/arc_summary.py' '$(CURDIR)/debian/tmp/usr/sbin/arc_summary.py'
++ mv '$(CURDIR)/debian/tmp/usr/bin/arcstat.py' '$(CURDIR)/debian/tmp/usr/sbin/arcstat.py'
++ mv '$(CURDIR)/debian/tmp/usr/bin/dbufstat.py' '$(CURDIR)/debian/tmp/usr/sbin/dbufstat.py'
+
@# Zed has dependencies outside of the system root.
$(INSTALL) -d '$(CURDIR)/debian/tmp/usr/sbin/'
- mv '$(CURDIR)/debian/tmp/sbin/zed' '$(CURDIR)/debian/tmp/usr/sbin/zed'
diff --git a/debian/zfsutils-linux.install b/debian/zfsutils-linux.install
-index 4407aa5..0de7474 100644
+index 947ffd9..4badbf1 100644
--- a/debian/zfsutils-linux.install
+++ b/debian/zfsutils-linux.install
@@ -19,9 +19,9 @@ sbin/zdb
diff --git a/zfs-patches/fix-control.patch b/zfs-patches/0002-remove-DKMS-modules-and-dracut-build.patch
similarity index 90%
rename from zfs-patches/fix-control.patch
rename to zfs-patches/0002-remove-DKMS-modules-and-dracut-build.patch
index f06b755..e6ef811 100644
--- a/zfs-patches/fix-control.patch
+++ b/zfs-patches/0002-remove-DKMS-modules-and-dracut-build.patch
@@ -1,8 +1,17 @@
+From 0e7871b8878f78fd2c8c73a50cbf805b39afb4e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler at proxmox.com>
-Date: Wed, 12 Oct 2016 11:25:40 +0200
-Subject: [PATCH 1/2] remove DKMS, modules and dracut build
+Date: Mon, 6 Feb 2017 11:03:10 +0100
+Subject: [PATCH 2/6] remove DKMS, modules and dracut build
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+Signed-off-by: Fabian Grünbichler <f.gruenbichler at proxmox.com>
---
+ debian/control.in | 34 +++---------------
+ debian/rules | 105 ++----------------------------------------------------
+ 2 files changed, 6 insertions(+), 133 deletions(-)
+
diff --git a/debian/control.in b/debian/control.in
index db75496..22dd958 100644
--- a/debian/control.in
@@ -78,7 +87,7 @@ index db75496..22dd958 100644
The Z file system is a pooled filesystem designed for maximum data
integrity, supporting data snapshots, multiple copies, and data
diff --git a/debian/rules b/debian/rules
-index 5036f42..6fc3e39 100755
+index 70e57e5..0c8a6a2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,9 +5,6 @@ NAME := $(shell awk '$$1 == "Name:" { print $$2; }' META)
@@ -115,9 +124,9 @@ index 5036f42..6fc3e39 100755
override_dh_auto_configure:
@cp debian/control.in debian/control
-@@ -62,36 +54,6 @@ override_dh_auto_install:
- @# Install the utilities.
- $(MAKE) install DESTDIR='$(CURDIR)/debian/tmp'
+@@ -74,36 +66,6 @@ override_dh_auto_install:
+ $(INSTALL) -d '$(CURDIR)/debian/tmp/usr/sbin/'
+ mv '$(CURDIR)/debian/tmp/sbin/zed' '$(CURDIR)/debian/tmp/usr/sbin/zed'
- @# Get a bare copy of the source code for DKMS.
- @# This creates the $(CURDIR)/$(NAME)-$(VERSION)/ tree, which does not
@@ -152,9 +161,9 @@ index 5036f42..6fc3e39 100755
mkdir -p $(CURDIR)/debian/tmp/usr/lib
for i in `ls $(CURDIR)/debian/tmp/lib/*.so`; do \
ln -s /lib/`readlink $${i}` $(CURDIR)/debian/tmp/usr/lib/`basename $${i}`; \
-@@ -101,9 +63,6 @@ override_dh_auto_install:
- chmod -x $(CURDIR)/debian/tmp/etc/zfs/zfs-functions
- chmod -x $(CURDIR)/debian/tmp/etc/default/zfs
+@@ -113,9 +75,6 @@ override_dh_auto_install:
+ chmod a-x $(CURDIR)/debian/tmp/etc/zfs/zfs-functions
+ chmod a-x $(CURDIR)/debian/tmp/etc/default/zfs
-override_dh_dkms:
- dh_dkms -V $(VERSION)
@@ -162,7 +171,7 @@ index 5036f42..6fc3e39 100755
override_dh_makeshlibs:
dh_makeshlibs -a
ifeq ($(BUILD_UDEB), true)
-@@ -141,65 +100,5 @@ override_dh_install:
+@@ -153,65 +112,5 @@ override_dh_install:
# ------------
diff --git a/zfs-patches/add-zfsutils-preinst-postinst.patch b/zfs-patches/0003-add-zfsutils.preinst-postinst-for-wheezy-upgrade-pat.patch
similarity index 86%
rename from zfs-patches/add-zfsutils-preinst-postinst.patch
rename to zfs-patches/0003-add-zfsutils.preinst-postinst-for-wheezy-upgrade-pat.patch
index ed77647..d71f049 100644
--- a/zfs-patches/add-zfsutils-preinst-postinst.patch
+++ b/zfs-patches/0003-add-zfsutils.preinst-postinst-for-wheezy-upgrade-pat.patch
@@ -1,7 +1,12 @@
+From 7e46d0f379706d74d5dc05ff20e58e708a1005a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler at proxmox.com>
Date: Wed, 12 Oct 2016 11:32:17 +0200
-Subject: [PATCH] add zfsutils.preinst/postinst for wheezy upgrade path
+Subject: [PATCH 3/6] add zfsutils.preinst/postinst for wheezy upgrade path
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+Signed-off-by: Fabian Grünbichler <f.gruenbichler at proxmox.com>
---
debian/zfsutils-linux.postinst | 20 ++++++++++++++++++++
debian/zfsutils-linux.preinst | 17 +++++++++++++++++
diff --git a/zfs-patches/fix-dependencies-for-upgrades.patch b/zfs-patches/0004-ensure-upgrade-path-from-existing-PVE-ZFS-packages.patch
similarity index 94%
rename from zfs-patches/fix-dependencies-for-upgrades.patch
rename to zfs-patches/0004-ensure-upgrade-path-from-existing-PVE-ZFS-packages.patch
index 92c4fe9..8e3584b 100644
--- a/zfs-patches/fix-dependencies-for-upgrades.patch
+++ b/zfs-patches/0004-ensure-upgrade-path-from-existing-PVE-ZFS-packages.patch
@@ -1,8 +1,12 @@
-From 4d9b9f40e1b92fba360aed1158578a75f32cbdce Mon Sep 17 00:00:00 2001
+From 97a0ced45e12cd4cca627392f2d9eea6963ee00e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler at proxmox.com>
Date: Wed, 12 Oct 2016 13:16:03 +0200
-Subject: [PATCH] ensure upgrade path from existing PVE ZFS packages
+Subject: [PATCH 4/6] ensure upgrade path from existing PVE ZFS packages
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+Signed-off-by: Fabian Grünbichler <f.gruenbichler at proxmox.com>
---
debian/control.in | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 58 insertions(+), 1 deletion(-)
diff --git a/zfs-patches/import-by-disk-id.patch b/zfs-patches/0005-import-with-d-dev-disk-by-id-in-scan-service.patch
similarity index 73%
rename from zfs-patches/import-by-disk-id.patch
rename to zfs-patches/0005-import-with-d-dev-disk-by-id-in-scan-service.patch
index 58c6bbe..6ad9cf1 100644
--- a/zfs-patches/import-by-disk-id.patch
+++ b/zfs-patches/0005-import-with-d-dev-disk-by-id-in-scan-service.patch
@@ -1,8 +1,12 @@
-From eb964a8215c04df7dd42f00c66618593db49c672 Mon Sep 17 00:00:00 2001
+From 9a97a884f8a409395e00891afdc28fa92b9f79b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler at proxmox.com>
Date: Mon, 24 Oct 2016 13:47:06 +0200
-Subject: [PATCH] import with -d /dev/disk/by-id in scan service
+Subject: [PATCH 5/6] import with -d /dev/disk/by-id in scan service
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+Signed-off-by: Fabian Grünbichler <f.gruenbichler at proxmox.com>
---
etc/systemd/system/zfs-import-scan.service.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/zfs-patches/fix-rm-path-in-zfs-share-service.patch b/zfs-patches/0006-fix-rm-path-in-zfs-share.service.patch
similarity index 71%
rename from zfs-patches/fix-rm-path-in-zfs-share-service.patch
rename to zfs-patches/0006-fix-rm-path-in-zfs-share.service.patch
index 27a8ea9..53e2c91 100644
--- a/zfs-patches/fix-rm-path-in-zfs-share-service.patch
+++ b/zfs-patches/0006-fix-rm-path-in-zfs-share.service.patch
@@ -1,8 +1,12 @@
-From 5ed5dcf71824eaee71726dbbefe68e42f9b79938 Mon Sep 17 00:00:00 2001
+From 4264f648987efc980002ede5add258a427ad9a05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler at proxmox.com>
Date: Thu, 27 Oct 2016 10:18:55 +0200
-Subject: [PATCH] fix rm path in zfs-share.service
+Subject: [PATCH 6/6] fix rm path in zfs-share.service
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+Signed-off-by: Fabian Grünbichler <f.gruenbichler at proxmox.com>
---
etc/systemd/system/zfs-share.service.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/zfs-patches/ignore-zfs-import-error.patch b/zfs-patches/ignore-zfs-import-error.patch
deleted file mode 100644
index 04003ce..0000000
--- a/zfs-patches/ignore-zfs-import-error.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-Index: new/etc/systemd/system/zfs-import-scan.service.in
-===================================================================
---- new.orig/etc/systemd/system/zfs-import-scan.service.in
-+++ new/etc/systemd/system/zfs-import-scan.service.in
-@@ -8,4 +8,4 @@ ConditionPathExists=!@sysconfdir@/zfs/zp
- [Service]
- Type=oneshot
- RemainAfterExit=yes
--ExecStart=@sbindir@/zpool import -d /dev/disk/by-id -aN
-+ExecStart=- at sbindir@/zpool import -d /dev/disk/by-id -aN
diff --git a/zfs-patches/series b/zfs-patches/series
index c29dda3..34bc638 100644
--- a/zfs-patches/series
+++ b/zfs-patches/series
@@ -1,6 +1,6 @@
-undo-python-changes-until-PVE-5.0.patch
-fix-control.patch
-add-zfsutils-preinst-postinst.patch
-fix-dependencies-for-upgrades.patch
-import-by-disk-id.patch
-fix-rm-path-in-zfs-share-service.patch
+0001-Undo-python-changes-until-PVE-5.0-release.patch
+0002-remove-DKMS-modules-and-dracut-build.patch
+0003-add-zfsutils.preinst-postinst-for-wheezy-upgrade-pat.patch
+0004-ensure-upgrade-path-from-existing-PVE-ZFS-packages.patch
+0005-import-with-d-dev-disk-by-id-in-scan-service.patch
+0006-fix-rm-path-in-zfs-share.service.patch
--
2.1.4
More information about the pve-devel
mailing list