drop patches no longer needed for stretch
This commit is contained in:
Fabian Grünbichler
parent
eee857a82b
commit
100fba2dff
@ -1,174 +0,0 @@
|
||||
From b8f3b081a866fc3d529fb2e72c425ef54c4d141d Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
|
||||
Date: Wed, 11 Jan 2017 09:16:11 +0100
|
||||
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
|
||||
|
||||
Revert "Remove .py extension from utilities in /usr/sbin as per policy 10.4 Scripts (LP: #1628279)"
|
||||
|
||||
This reverts commit e1c956cc55451476c465aad351c4b9c92294fc36.
|
||||
|
||||
Revert "Use python3 for arcstat.py, arc_summary.py & dbufstat.py (LP: #1627909)"
|
||||
|
||||
This reverts commit a52a9356809b8a09b97957a238a36da82ce9f850.
|
||||
|
||||
Revert "Add missing part in python3 move"
|
||||
|
||||
This reverts commit 9173586640d4a9f64f87a70bb9f93e41c78009fc.
|
||||
|
||||
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
|
||||
---
|
||||
debian/control.in | 4 ++--
|
||||
debian/patches/1001-cmd-python-exec-path.patch | 30 --------------------------
|
||||
debian/control | 4 ++--
|
||||
debian/patches/series | 1 -
|
||||
debian/rules | 11 ++++------
|
||||
debian/zfsutils-linux.install | 6 +++---
|
||||
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
|
||||
index 76907e4..db75496 100644
|
||||
--- a/debian/control.in
|
||||
+++ b/debian/control.in
|
||||
@@ -16,7 +16,7 @@ Build-Depends: dh-autoreconf,
|
||||
po-debconf,
|
||||
uuid-dev,
|
||||
zlib1g-dev,
|
||||
- python3,
|
||||
+ python,
|
||||
dh-python,
|
||||
libblkid-dev,
|
||||
libattr1-dev
|
||||
@@ -127,7 +127,7 @@ Description: OpenZFS root filesystem capabilities for Linux - dracut
|
||||
Package: zfsutils-linux
|
||||
Section: contrib/admin
|
||||
Architecture: linux-any
|
||||
-Depends: ${misc:Depends}, ${shlibs:Depends}, ${python3:Depends}, python3
|
||||
+Depends: ${misc:Depends}, ${shlibs:Depends}, ${python:Depends}
|
||||
Recommends: lsb-base, zfs-modules | zfs-dkms, zfs-zed
|
||||
Suggests: nfs-kernel-server, samba-common-bin (>= 3.0.23), zfs-initramfs | zfs-dracut
|
||||
Conflicts: zfs, zfs-fuse, zutils
|
||||
diff --git a/debian/patches/1001-cmd-python-exec-path.patch b/debian/patches/1001-cmd-python-exec-path.patch
|
||||
deleted file mode 100644
|
||||
index a05afb4..0000000
|
||||
--- a/debian/patches/1001-cmd-python-exec-path.patch
|
||||
+++ /dev/null
|
||||
@@ -1,30 +0,0 @@
|
||||
-Index: zfs-linux-0.6.5.8/cmd/arc_summary/arc_summary.py
|
||||
-===================================================================
|
||||
---- zfs-linux-0.6.5.8.orig/cmd/arc_summary/arc_summary.py
|
||||
-+++ zfs-linux-0.6.5.8/cmd/arc_summary/arc_summary.py
|
||||
-@@ -1,4 +1,4 @@
|
||||
--#!/usr/bin/python
|
||||
-+#!/usr/bin/python3
|
||||
- #
|
||||
- # $Id: arc_summary.pl,v 388:e27800740aa2 2011-07-08 02:53:29Z jhell $
|
||||
- #
|
||||
-Index: zfs-linux-0.6.5.8/cmd/arcstat/arcstat.py
|
||||
-===================================================================
|
||||
---- zfs-linux-0.6.5.8.orig/cmd/arcstat/arcstat.py
|
||||
-+++ zfs-linux-0.6.5.8/cmd/arcstat/arcstat.py
|
||||
-@@ -1,4 +1,4 @@
|
||||
--#!/usr/bin/python
|
||||
-+#!/usr/bin/python3
|
||||
- #
|
||||
- # Print out ZFS ARC Statistics exported via kstat(1)
|
||||
- # For a definition of fields, or usage, use arctstat.pl -v
|
||||
-Index: zfs-linux-0.6.5.8/cmd/dbufstat/dbufstat.py
|
||||
-===================================================================
|
||||
---- zfs-linux-0.6.5.8.orig/cmd/dbufstat/dbufstat.py
|
||||
-+++ zfs-linux-0.6.5.8/cmd/dbufstat/dbufstat.py
|
||||
-@@ -1,4 +1,4 @@
|
||||
--#!/usr/bin/python
|
||||
-+#!/usr/bin/python3
|
||||
- #
|
||||
- # Print out statistics for all cached dmu buffers. This information
|
||||
- # is available through the dbufs kstat and may be post-processed as
|
||||
diff --git a/debian/control b/debian/control
|
||||
index 76907e4..db75496 100644
|
||||
--- a/debian/control
|
||||
+++ b/debian/control
|
||||
@@ -16,7 +16,7 @@ Build-Depends: dh-autoreconf,
|
||||
po-debconf,
|
||||
uuid-dev,
|
||||
zlib1g-dev,
|
||||
- python3,
|
||||
+ python,
|
||||
dh-python,
|
||||
libblkid-dev,
|
||||
libattr1-dev
|
||||
@@ -127,7 +127,7 @@ Description: OpenZFS root filesystem capabilities for Linux - dracut
|
||||
Package: zfsutils-linux
|
||||
Section: contrib/admin
|
||||
Architecture: linux-any
|
||||
-Depends: ${misc:Depends}, ${shlibs:Depends}, ${python3:Depends}, python3
|
||||
+Depends: ${misc:Depends}, ${shlibs:Depends}, ${python:Depends}
|
||||
Recommends: lsb-base, zfs-modules | zfs-dkms, zfs-zed
|
||||
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 df85d5b..0fed690 100644
|
||||
--- a/debian/patches/series
|
||||
+++ b/debian/patches/series
|
||||
@@ -4,7 +4,6 @@
|
||||
1000-ppc64el-endian-support.patch
|
||||
1002-fix-mips-build.patch
|
||||
enable-zed.patch
|
||||
-1001-cmd-python-exec-path.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 9efbace..70e57e5 100755
|
||||
--- a/debian/rules
|
||||
+++ b/debian/rules
|
||||
@@ -35,7 +35,7 @@ pmodules = $(PACKAGE)-modules-$(non_epoch_version)
|
||||
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
|
||||
|
||||
%:
|
||||
- dh $@ --with autoreconf,dkms,python3,systemd --parallel
|
||||
+ dh $@ --with autoreconf,dkms,python2,systemd --parallel
|
||||
|
||||
override_dh_auto_configure:
|
||||
@cp debian/control.in debian/control
|
||||
@@ -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
|
||||
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/'
|
||||
diff --git a/debian/zfsutils-linux.install b/debian/zfsutils-linux.install
|
||||
index 947ffd9..4badbf1 100644
|
||||
--- a/debian/zfsutils-linux.install
|
||||
+++ b/debian/zfsutils-linux.install
|
||||
@@ -19,9 +19,9 @@ sbin/zdb
|
||||
sbin/zpios
|
||||
sbin/zpool
|
||||
sbin/zfs
|
||||
-usr/sbin/arc_summary
|
||||
-usr/sbin/arcstat
|
||||
-usr/sbin/dbufstat
|
||||
+usr/sbin/arc_summary.py
|
||||
+usr/sbin/arcstat.py
|
||||
+usr/sbin/dbufstat.py
|
||||
usr/share/zfs/
|
||||
usr/share/man/man1/
|
||||
usr/share/man/man5/
|
||||
--
|
||||
2.1.4
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 0e7871b8878f78fd2c8c73a50cbf805b39afb4e7 Mon Sep 17 00:00:00 2001
|
||||
From 1e8bad4694e0d0e94ae5596b94f55e434033bb47 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
|
||||
Date: Mon, 6 Feb 2017 11:03:10 +0100
|
||||
Subject: [PATCH 2/6] remove DKMS, modules and dracut build
|
||||
Subject: [PATCH 1/3] remove DKMS, modules and dracut build
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
@ -13,7 +13,7 @@ Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
|
||||
2 files changed, 6 insertions(+), 133 deletions(-)
|
||||
|
||||
diff --git a/debian/control.in b/debian/control.in
|
||||
index db75496..22dd958 100644
|
||||
index 76907e4..235e74c 100644
|
||||
--- a/debian/control.in
|
||||
+++ b/debian/control.in
|
||||
@@ -9,7 +9,6 @@ Build-Depends: dh-autoreconf,
|
||||
@ -69,7 +69,7 @@ index db75496..22dd958 100644
|
||||
Package: zfsutils-linux
|
||||
Section: contrib/admin
|
||||
Architecture: linux-any
|
||||
Depends: ${misc:Depends}, ${shlibs:Depends}, ${python:Depends}
|
||||
Depends: ${misc:Depends}, ${shlibs:Depends}, ${python3:Depends}, python3
|
||||
-Recommends: lsb-base, zfs-modules | zfs-dkms, zfs-zed
|
||||
-Suggests: nfs-kernel-server, samba-common-bin (>= 3.0.23), zfs-initramfs | zfs-dracut
|
||||
+Recommends: lsb-base, zfs-zed
|
||||
@ -87,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 70e57e5..0c8a6a2 100755
|
||||
index 9efbace..49da706 100755
|
||||
--- a/debian/rules
|
||||
+++ b/debian/rules
|
||||
@@ -5,9 +5,6 @@ NAME := $(shell awk '$$1 == "Name:" { print $$2; }' META)
|
||||
@ -119,12 +119,12 @@ index 70e57e5..0c8a6a2 100755
|
||||
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
|
||||
|
||||
%:
|
||||
- dh $@ --with autoreconf,dkms,python2,systemd --parallel
|
||||
+ dh $@ --with autoreconf,python2,systemd --parallel
|
||||
- dh $@ --with autoreconf,dkms,python3,systemd --parallel
|
||||
+ dh $@ --with autoreconf,python3,systemd --parallel
|
||||
|
||||
override_dh_auto_configure:
|
||||
@cp debian/control.in debian/control
|
||||
@@ -74,36 +66,6 @@ override_dh_auto_install:
|
||||
@@ -77,36 +69,6 @@ override_dh_auto_install:
|
||||
$(INSTALL) -d '$(CURDIR)/debian/tmp/usr/sbin/'
|
||||
mv '$(CURDIR)/debian/tmp/sbin/zed' '$(CURDIR)/debian/tmp/usr/sbin/zed'
|
||||
|
||||
@ -161,7 +161,7 @@ index 70e57e5..0c8a6a2 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}`; \
|
||||
@@ -113,9 +75,6 @@ override_dh_auto_install:
|
||||
@@ -116,9 +78,6 @@ override_dh_auto_install:
|
||||
chmod a-x $(CURDIR)/debian/tmp/etc/zfs/zfs-functions
|
||||
chmod a-x $(CURDIR)/debian/tmp/etc/default/zfs
|
||||
|
||||
@ -171,7 +171,7 @@ index 70e57e5..0c8a6a2 100755
|
||||
override_dh_makeshlibs:
|
||||
dh_makeshlibs -a
|
||||
ifeq ($(BUILD_UDEB), true)
|
||||
@@ -153,65 +112,5 @@ override_dh_install:
|
||||
@@ -156,65 +115,5 @@ override_dh_install:
|
||||
|
||||
# ------------
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 9a97a884f8a409395e00891afdc28fa92b9f79b3 Mon Sep 17 00:00:00 2001
|
||||
From e64c1e7341865c7a0b060ac9aa9a988ad589b31f Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
|
||||
Date: Mon, 24 Oct 2016 13:47:06 +0200
|
||||
Subject: [PATCH 5/6] import with -d /dev/disk/by-id in scan service
|
||||
Subject: [PATCH 2/3] 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
|
||||
@ -1,68 +0,0 @@
|
||||
From 7e46d0f379706d74d5dc05ff20e58e708a1005a6 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
|
||||
Date: Wed, 12 Oct 2016 11:32:17 +0200
|
||||
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@proxmox.com>
|
||||
---
|
||||
debian/zfsutils-linux.postinst | 20 ++++++++++++++++++++
|
||||
debian/zfsutils-linux.preinst | 17 +++++++++++++++++
|
||||
2 files changed, 37 insertions(+)
|
||||
create mode 100755 debian/zfsutils-linux.postinst
|
||||
create mode 100755 debian/zfsutils-linux.preinst
|
||||
|
||||
diff --git a/debian/zfsutils-linux.postinst b/debian/zfsutils-linux.postinst
|
||||
new file mode 100755
|
||||
index 0000000..7d57919
|
||||
--- /dev/null
|
||||
+++ b/debian/zfsutils-linux.postinst
|
||||
@@ -0,0 +1,20 @@
|
||||
+#!/bin/sh
|
||||
+
|
||||
+set -e
|
||||
+
|
||||
+# Source debconf library
|
||||
+. /usr/share/debconf/confmodule
|
||||
+
|
||||
+if dpkg-maintscript-helper supports rm_conffile 2>/dev/null
|
||||
+then
|
||||
+ dpkg-maintscript-helper rm_conffile /etc/default/zfsload -- "$@"
|
||||
+ dpkg-maintscript-helper rm_conffile /etc/init.d/zfs -- "$@"
|
||||
+ dpkg-maintscript-helper rm_conffile /etc/init.d/zed -- "$@"
|
||||
+ dpkg-maintscript-helper rm_conffile /etc/init.d/zfs-zed -- "$@"
|
||||
+ dpkg-maintscript-helper rm_conffile /etc/init.d/zfs-mount -- "$@"
|
||||
+ dpkg-maintscript-helper rm_conffile /etc/init.d/zfs-share -- "$@"
|
||||
+ dpkg-maintscript-helper rm_conffile /etc/init.d/zfs-import -- "$@"
|
||||
+fi
|
||||
+
|
||||
+#DEBHELPER#
|
||||
+
|
||||
diff --git a/debian/zfsutils-linux.preinst b/debian/zfsutils-linux.preinst
|
||||
new file mode 100755
|
||||
index 0000000..9338a7c
|
||||
--- /dev/null
|
||||
+++ b/debian/zfsutils-linux.preinst
|
||||
@@ -0,0 +1,17 @@
|
||||
+#!/bin/sh
|
||||
+
|
||||
+set -e
|
||||
+
|
||||
+if dpkg-maintscript-helper supports rm_conffile 2>/dev/null
|
||||
+then
|
||||
+ dpkg-maintscript-helper rm_conffile /etc/default/zfsload -- "$@"
|
||||
+ dpkg-maintscript-helper rm_conffile /etc/init.d/zfs -- "$@"
|
||||
+ dpkg-maintscript-helper rm_conffile /etc/init.d/zed -- "$@"
|
||||
+ dpkg-maintscript-helper rm_conffile /etc/init.d/zfs-zed -- "$@"
|
||||
+ dpkg-maintscript-helper rm_conffile /etc/init.d/zfs-mount -- "$@"
|
||||
+ dpkg-maintscript-helper rm_conffile /etc/init.d/zfs-share -- "$@"
|
||||
+ dpkg-maintscript-helper rm_conffile /etc/init.d/zfs-import -- "$@"
|
||||
+fi
|
||||
+
|
||||
+#DEBHELPER#
|
||||
+
|
||||
--
|
||||
2.1.4
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 4264f648987efc980002ede5add258a427ad9a05 Mon Sep 17 00:00:00 2001
|
||||
From b6507e2f68b8b57f2989833c39b3512ee53c51ce Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
|
||||
Date: Thu, 27 Oct 2016 10:18:55 +0200
|
||||
Subject: [PATCH 6/6] fix rm path in zfs-share.service
|
||||
Subject: [PATCH 3/3] fix rm path in zfs-share.service
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
@ -1,141 +0,0 @@
|
||||
From 97a0ced45e12cd4cca627392f2d9eea6963ee00e Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
|
||||
Date: Wed, 12 Oct 2016 13:16:03 +0200
|
||||
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@proxmox.com>
|
||||
---
|
||||
debian/control.in | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
|
||||
1 file changed, 58 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/debian/control.in b/debian/control.in
|
||||
index 22dd958..2bee2bf 100644
|
||||
--- a/debian/control.in
|
||||
+++ b/debian/control.in
|
||||
@@ -28,6 +28,8 @@ Package: libnvpair1linux
|
||||
Section: contrib/libs
|
||||
Architecture: linux-any
|
||||
Depends: ${misc:Depends}, ${shlibs:Depends}
|
||||
+Replaces: libnvpair1 (<< 0.6.5.8-pve11~bpo80)
|
||||
+Breaks: libnvpair1 (<< 0.6.5.8-pve11~bpo80)
|
||||
Description: Solaris name-value library for Linux
|
||||
This library provides routines for packing and unpacking nv pairs for
|
||||
transporting data across process boundaries, transporting between
|
||||
@@ -37,6 +39,8 @@ Package: libuutil1linux
|
||||
Section: contrib/libs
|
||||
Architecture: linux-any
|
||||
Depends: ${misc:Depends}, ${shlibs:Depends}
|
||||
+Replaces: libuutil1 (<< 0.6.5.8-pve11~bpo80)
|
||||
+Breaks: libuutil1 (<< 0.6.5.8-pve11~bpo80)
|
||||
Description: Solaris userland utility library for Linux
|
||||
This library provides a variety of glue functions for ZFS on Linux:
|
||||
* libspl: The Solaris Porting Layer userland library, which provides APIs
|
||||
@@ -54,6 +58,8 @@ Architecture: linux-any
|
||||
Depends: libzfs2linux (= ${binary:Version}), libzpool2linux (= ${binary:Version}),
|
||||
libnvpair1linux (= ${binary:Version}), libuutil1linux (= ${binary:Version}),
|
||||
${misc:Depends}
|
||||
+Replaces: libzfs-dev (<< 0.6.5.8-pve11~bpo80)
|
||||
+Breaks: libzfs-dev (<< 0.6.5.8-pve11~bpo80)
|
||||
Provides: libnvpair-dev, libuutil-dev
|
||||
Description: OpenZFS filesystem development files for Linux
|
||||
Header files and static libraries for compiling software against
|
||||
@@ -66,6 +72,8 @@ Package: libzfs2linux
|
||||
Section: contrib/libs
|
||||
Architecture: linux-any
|
||||
Depends: ${misc:Depends}, ${shlibs:Depends}
|
||||
+Replaces: libzfs2 (<< 0.6.5.8-pve11~bpo80)
|
||||
+Breaks: libzfs2 (<< 0.6.5.8-pve11~bpo80)
|
||||
Description: OpenZFS filesystem library for Linux
|
||||
The Z file system is a pooled filesystem designed for maximum data
|
||||
integrity, supporting data snapshots, multiple copies, and data
|
||||
@@ -77,6 +85,8 @@ Package: libzpool2linux
|
||||
Section: contrib/libs
|
||||
Architecture: linux-any
|
||||
Depends: ${misc:Depends}, ${shlibs:Depends}
|
||||
+Replaces: libzpool2 (<< 0.6.5.8-pve11~bpo80)
|
||||
+Breaks: libzpool2 (<< 0.6.5.8-pve11~bpo80)
|
||||
Description: OpenZFS pool library for Linux
|
||||
The Z file system is a pooled filesystem designed for maximum data
|
||||
integrity, supporting data snapshots, multiple copies, and data
|
||||
@@ -88,8 +98,10 @@ Package: zfs-initramfs
|
||||
Architecture: all
|
||||
Depends: initramfs-tools,
|
||||
busybox-initramfs | busybox-static | busybox,
|
||||
- zfsutils-linux,
|
||||
+ zfsutils-linux (>= 0.6.5.8-pve11~bpo80),
|
||||
${misc:Depends}
|
||||
+Breaks: zfs-initramfs (<< 0.6.5.8-pve11~bpo80)
|
||||
+Replaces: zfs-initramfs (<< 0.6.5.8-pve11~bpo80)
|
||||
Description: OpenZFS root filesystem capabilities for Linux - initramfs
|
||||
The Z file system is a pooled filesystem designed for maximum data
|
||||
integrity, supporting data snapshots, multiple copies, and data
|
||||
@@ -104,7 +116,9 @@ Architecture: linux-any
|
||||
Depends: ${misc:Depends}, ${shlibs:Depends}, ${python:Depends}
|
||||
Recommends: lsb-base, zfs-zed
|
||||
Suggests: nfs-kernel-server, samba-common-bin (>= 3.0.23), zfs-initramfs
|
||||
+Replaces: zfsutils (<< 0.6.5.8-pve11~bpo80)
|
||||
Conflicts: zfs, zfs-fuse, zutils
|
||||
+Breaks: zfsutils (<< 0.6.5.8-pve11~bpo80)
|
||||
Provides: zfsutils
|
||||
Description: command-line tools to manage OpenZFS filesystems
|
||||
The Z file system is a pooled filesystem designed for maximum data
|
||||
@@ -118,6 +132,7 @@ Package: zfs-zed
|
||||
Section: contrib/admin
|
||||
Architecture: linux-any
|
||||
Depends: ${misc:Depends}, ${shlibs:Depends}, zfsutils-linux
|
||||
+Replaces: zfsutils (<< 0.6.5.8-pve11~bpo80)
|
||||
Description: OpenZFS Event Daemon
|
||||
The Z file system is a pooled filesystem designed for maximum data
|
||||
integrity, supporting data snapshots, multiple copies, and data
|
||||
@@ -142,3 +157,45 @@ Description: Debugging symbols for OpenZFS userland libraries and tools
|
||||
.
|
||||
This package contains the debugging symbols for libzpool2linux, libzfs2linux,
|
||||
libnvpair1linux, libuutil1linux, zfs-zed and zfsutils-linux.
|
||||
+
|
||||
+# Transitional packages
|
||||
+
|
||||
+Package: libzfs2
|
||||
+Depends: libzfs2linux, ${misc:Depends}
|
||||
+Architecture: all
|
||||
+Priority: extra
|
||||
+Section: oldlibs
|
||||
+Description: transitional package
|
||||
+ This is a transitional package. It can safely be removed.
|
||||
+
|
||||
+Package: libzpool2
|
||||
+Depends: libzpool2linux, ${misc:Depends}
|
||||
+Architecture: all
|
||||
+Priority: extra
|
||||
+Section: oldlibs
|
||||
+Description: transitional package
|
||||
+ This is a transitional package. It can safely be removed.
|
||||
+
|
||||
+Package: libnvpair1
|
||||
+Depends: libnvpair1linux, ${misc:Depends}
|
||||
+Architecture: all
|
||||
+Priority: extra
|
||||
+Section: oldlibs
|
||||
+Description: transitional package
|
||||
+ This is a transitional package. It can safely be removed.
|
||||
+
|
||||
+Package: libuutil1
|
||||
+Depends: libuutil1linux, ${misc:Depends}
|
||||
+Architecture: all
|
||||
+Priority: extra
|
||||
+Section: oldlibs
|
||||
+Description: transitional package
|
||||
+ This is a transitional package. It can safely be removed.
|
||||
+
|
||||
+Package: zfsutils
|
||||
+Depends: zfsutils-linux, ${misc:Depends}
|
||||
+Architecture: all
|
||||
+Priority: extra
|
||||
+Section: oldlibs
|
||||
+Description: transitional package
|
||||
+ This is a transitional package. It can safely be removed.
|
||||
--
|
||||
2.1.4
|
||||
|
||||
@ -1,6 +1,3 @@
|
||||
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
|
||||
0001-remove-DKMS-modules-and-dracut-build.patch
|
||||
0002-import-with-d-dev-disk-by-id-in-scan-service.patch
|
||||
0003-fix-rm-path-in-zfs-share.service.patch
|
||||
|
||||
Loading…
Reference in New Issue
Block a user