Use python3 for arcstat.py, arc_summary.py & dbufstat.py (LP: #1627909)

diff --git a/debian/control b/debian/control
index db75496686738edf73a5399c54ce0a3dc64ec7e6..76907e457839bd2c22ff2c72149f2e8ca3b5dc07 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ Build-Depends: dh-autoreconf,
                po-debconf,
                uuid-dev,
                zlib1g-dev,
-               python,
+               python3,
                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}, ${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
 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
new file mode 100644 (file)
index 0000000..a05afb4
--- /dev/null
+++ b/debian/patches/1001-cmd-python-exec-path.patch
@@ -0,0 +1,30 @@
+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/patches/series b/debian/patches/series
index 26e7ae3bd2f9d9ea6f937b583f70411795a0b5e5..37d9781346a0f9bf7d303281210be990decccc79 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
 1000-ppc64el-endian-support.patch
 1002-fix-mips-build.patch
 enable-zed.patch
+1001-cmd-python-exec-path.patch

diff --git a/debian/rules b/debian/rules
index c5bb7dc410a77b27885ad762c5cdd3544ab8c685..949858e652a11e4ae5a13d299c722858eb0b6936 100755 (executable)
--- 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,python2,systemd --parallel
+       dh $@ --with autoreconf,dkms,python3,systemd --parallel
 
 override_dh_auto_configure:
        @cp debian/control.in debian/control