[Pkg-zfsonlinux-devel] [SCM] zfs branch, master, updated. debian/0.6.5.7-1-6-g356f442

Aron Xu aron at debian.org
Fri Aug 12 07:17:13 UTC 2016


The following commit has been merged in the master branch:
commit b83d293b8d8d62432537c1facd25d6c30b6417a2
Author: Eric Desrochers <eric.desrochers at canonical.com>
Date:   Mon Aug 1 15:54:47 2016 -0400

    Change utilities path (bindir) to /usr/sbin (Closes: #832938)

diff --git a/debian/changelog b/debian/changelog
index def7678..9a8a52d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+zfs-linux (0.6.5.7-2) unstable; urgency=medium
+
+  * Change utilities path (bindir) to /usr/sbin
+
+ -- Eric Desrochers <eric.desrochers at canonical.com>  Mon, 01 Aug 2016 15:53:58 -0400
+
 zfs-linux (0.6.5.7-1) unstable; urgency=medium
 
   [ YunQiang Su ]
diff --git a/debian/rules b/debian/rules
index 42816c5..5036f42 100755
--- a/debian/rules
+++ b/debian/rules
@@ -48,7 +48,7 @@ endif
 
 	@# Build the userland, but don't build the kernel modules.
 	dh_auto_configure -- \
-	  --bindir=/bin \
+	  --bindir=/usr/sbin \
 	  --sbindir=/sbin \
 	  --libdir=/lib \
 	  --with-udevdir=/lib/udev \
diff --git a/debian/zfsutils-linux.install b/debian/zfsutils-linux.install
index a12ad7b..99cc48c 100644
--- a/debian/zfsutils-linux.install
+++ b/debian/zfsutils-linux.install
@@ -5,7 +5,6 @@ usr/lib/modules-load.d/ lib/
 lib/udev/
 etc/default/zfs
 etc/zfs/zfs-functions
-bin/
 sbin/fsck.zfs
 sbin/mount.zfs
 sbin/ztest
@@ -16,6 +15,9 @@ sbin/zdb
 sbin/zpios
 sbin/zpool
 sbin/zfs
+usr/sbin/arc_summary.py
+usr/sbin/arcstat.py
+usr/sbin/dbufstat.py
 usr/share/zfs/
 usr/share/man/man1/
 usr/share/man/man5/

-- 
OpenZFS on Linux



More information about the Pkg-zfsonlinux-devel mailing list