From b8f3b081a866fc3d529fb2e72c425ef54c4d141d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= 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 --- 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