Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
---
- debian/control.in | 36 +++---------------
+ debian/control.in | 41 ++------------------
debian/control | 1 -
- debian/not-installed | 1 +
+ debian/not-installed | 2 +
debian/rules | 105 +--------------------------------------------------
- 4 files changed, 8 insertions(+), 135 deletions(-)
+ 4 files changed, 7 insertions(+), 142 deletions(-)
diff --git a/debian/control.in b/debian/control.in
-index 771fc3a80..edfed470f 100644
+index aef8cac2e..3cc15a05b 100644
--- a/debian/control.in
+++ b/debian/control.in
-@@ -8,7 +8,6 @@ Uploaders: Aron Xu <aron@debian.org>,
- Build-Depends: dh-autoreconf,
- autotools-dev,
+@@ -9,7 +9,6 @@ Build-Depends: autotools-dev,
debhelper (>= 10.2),
+ dh-autoreconf,
+ dh-python,
- dkms (>> 2.1.1.2-5),
+ libattr1-dev,
+ libblkid-dev,
libselinux1-dev,
- libtool,
- lsb-release,
-@@ -84,25 +83,11 @@ Description: OpenZFS pool library for Linux
+@@ -86,27 +85,10 @@ Description: OpenZFS pool library for Linux
.
This zpool library provides support for managing zpools.
-Package: zfs-dkms
-Architecture: all
--Pre-Depends: spl-dkms (>= ${source:Upstream-Version}), spl-dkms (<<${source:Upstream-Version}.)
+-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: zfs-zed, zfsutils-linux (>= ${binary:Version}),
+- @LINUX_COMPAT@
-Provides: zfs-modules
-Description: OpenZFS filesystem kernel modules for Linux
- The Z file system is a pooled filesystem designed for maximum data
-
Package: zfs-initramfs
Architecture: all
- Depends: initramfs-tools,
- busybox-initramfs | busybox-static | busybox,
-- zfs-modules | zfs-dkms, zfsutils-linux,
-+ zfsutils-linux,
- ${misc:Depends}
+ Depends: busybox-initramfs | busybox-static | busybox,
+ initramfs-tools,
+- zfs-modules | zfs-dkms,
+ 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
+@@ -117,29 +99,14 @@ 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
Package: zfsutils-linux
Section: contrib/admin
Architecture: linux-any
- Depends: ${misc:Depends}, ${shlibs:Depends}, ${python3:Depends}, python3
+ Depends: python3, ${misc:Depends}, ${python3:Depends}, ${shlibs:Depends}
-Recommends: lsb-base, zfs-modules | zfs-dkms, zfs-zed
--Suggests: nfs-kernel-server, samba-common-bin (>= 3.0.23), zfs-initramfs | zfs-dracut
+-Breaks: zfs-dkms (<< ${binary:Version}), zfs-dkms (>> ${binary:Version})
+Recommends: lsb-base, zfs-zed
-+Suggests: nfs-kernel-server, samba-common-bin (>= 3.0.23), zfs-initramfs
+ Suggests: nfs-kernel-server,
+ samba-common-bin (>= 3.0.23),
+- zfs-initramfs | zfs-dracut
++ 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
+@@ -153,8 +120,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: zfs-modules | zfs-dkms,
+- zfsutils-linux (>= ${binary:Version}),
++Depends: zfsutils-linux (>= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
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
- 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
- Breaks: zfsutils-linux (<= 0.6.5.11-1)
- Replaces: zfsutils-linux (<= 0.6.5.11-1)
- Description: OpenZFS test infrastructure an support scripts
+@@ -177,7 +143,6 @@ Depends: acl,
+ python,
+ sudo,
+ sysstat,
+- zfs-modules | zfs-dkms,
+ zfsutils-linux (>=${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
diff --git a/debian/control b/debian/control
-index 771fc3a80..be0b90337 100644
+index 3cf6fb649..51cfe6a64 100644
--- a/debian/control
+++ b/debian/control
-@@ -8,7 +8,6 @@ Uploaders: Aron Xu <aron@debian.org>,
- Build-Depends: dh-autoreconf,
- autotools-dev,
+@@ -9,7 +9,6 @@ Build-Depends: autotools-dev,
debhelper (>= 10.2),
+ dh-autoreconf,
+ dh-python,
- dkms (>> 2.1.1.2-5),
+ libattr1-dev,
+ libblkid-dev,
libselinux1-dev,
- libtool,
- lsb-release,
diff --git a/debian/not-installed b/debian/not-installed
-index f54fe7310..16b1cef6c 100644
+index f54fe7310..c3929d90e 100644
--- a/debian/not-installed
+++ b/debian/not-installed
-@@ -5,3 +5,4 @@ etc/zfs/vdev_id.conf.alias.example
+@@ -5,3 +5,5 @@ etc/zfs/vdev_id.conf.alias.example
etc/zfs/vdev_id.conf.multipath.example
etc/zfs/vdev_id.conf.sas_direct.example
etc/zfs/vdev_id.conf.sas_switch.example
+usr/lib/dracut
++usr/share/zfs/enum-extract.pl
diff --git a/debian/rules b/debian/rules
-index f445b58c5..d71926b33 100755
+index cc47a74a1..a5c37c81d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,9 +5,6 @@ include /usr/share/dpkg/default.mk
+ dh $@ --with autoreconf,python3,systemd --parallel
override_dh_auto_configure:
- @cp debian/control.in debian/control
+ sed "s/@LINUX_COMPAT@/linux-libc-dev \(< $(shell debian/get_next.sh)\)/" debian/control.in > debian/control
@@ -73,36 +65,6 @@ override_dh_auto_install:
$(INSTALL) -d '$(CURDIR)/debian/tmp/usr/sbin/'
mv '$(CURDIR)/debian/tmp/sbin/zed' '$(CURDIR)/debian/tmp/usr/sbin/zed'
projects / zfsonlinux.git / blobdiff