revert python changes
these changes are a bit disruptive for a minor version bump, postpone until PVE 5.0 packages + upgrade notes.
This commit is contained in:
Fabian Grünbichler
parent
81f5dae8f7
commit
904f90c739
@ -1,3 +1,4 @@
|
|||||||
|
undo-python-changes-until-PVE-5.0.patch
|
||||||
fix-control.patch
|
fix-control.patch
|
||||||
add-zfsutils-preinst-postinst.patch
|
add-zfsutils-preinst-postinst.patch
|
||||||
fix-dependencies-for-upgrades.patch
|
fix-dependencies-for-upgrades.patch
|
||||||
|
|||||||
169
zfs-patches/undo-python-changes-until-PVE-5.0.patch
Normal file
169
zfs-patches/undo-python-changes-until-PVE-5.0.patch
Normal file
@ -0,0 +1,169 @@
|
|||||||
|
From 1e12e32aa10269bf46860b11b50795833374af00 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] 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 | 9 +-------
|
||||||
|
debian/zfsutils-linux.install | 6 +++---
|
||||||
|
6 files changed, 8 insertions(+), 46 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 af018e2..4ba6140 100644
|
||||||
|
--- a/debian/patches/series
|
||||||
|
+++ b/debian/patches/series
|
||||||
|
@@ -4,6 +4,5 @@
|
||||||
|
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
|
||||||
|
diff --git a/debian/rules b/debian/rules
|
||||||
|
index 15e0592..fc23f5f 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
|
||||||
|
@@ -62,13 +62,6 @@ override_dh_auto_install:
|
||||||
|
@# Install the utilities.
|
||||||
|
$(MAKE) install DESTDIR='$(CURDIR)/debian/tmp'
|
||||||
|
|
||||||
|
-
|
||||||
|
- # 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'
|
||||||
|
-
|
||||||
|
@# 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
|
||||||
|
--- 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
|
||||||
|
|
||||||
Loading…
Reference in New Issue
Block a user