[Pkg-zfsonlinux-devel] [SCM] zfs branch, master, updated. debian/0.6.5.8-3-70-g7ca5474

[Aron Xu]

The following commit has been merged in the master branch:
commit b7361d56f7039ad69e93e3e9b647da69b5fb647a
Author: Aron Xu <aron at debian.org>
Date:   Mon Dec 18 22:47:20 2017 +0800

    cherry-pick: fix distclean which removes needed files

diff --git a/debian/patches/0001-Fix-bug-in-distclean-which-removes-needed-files.patch b/debian/patches/0001-Fix-bug-in-distclean-which-removes-needed-files.patch
new file mode 100644
index 0000000..e16758b
--- /dev/null
+++ b/debian/patches/0001-Fix-bug-in-distclean-which-removes-needed-files.patch
@@ -0,0 +1,36 @@
+From b1490dd43e3c98649c7d23928d908f5bb019411b Mon Sep 17 00:00:00 2001
+From: David Quigley <dpquigl at users.noreply.github.com>
+Date: Wed, 13 Sep 2017 12:45:04 -0600
+Subject: [PATCH 001/144] Fix bug in distclean which removes needed files
+
+Running distclean removes the following files because of an error
+in Makefile.am
+
+deleted:    tests/zfs-tests/include/commands.cfg
+deleted:    tests/zfs-tests/include/libtest.shlib
+deleted:    tests/zfs-tests/include/math.shlib
+deleted:    tests/zfs-tests/include/properties.shlib
+deleted:    tests/zfs-tests/include/zpool_script.shlib
+
+Reviewed-by: George Melikov <mail at gmelikov.ru>
+Reviewed-by: Brian Behlendorf <behlendorf1 at llnl.gov>
+Reviewed-by: Giuseppe Di Natale <dinatale2 at llnl.gov>
+Signed-off-by: David Quigley <david.quigley at intel.com>
+Closes #6636
+---
+ tests/zfs-tests/include/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/zfs-tests/include/Makefile.am b/tests/zfs-tests/include/Makefile.am
+index 579e1356e..24633ccc3 100644
+--- a/tests/zfs-tests/include/Makefile.am
++++ b/tests/zfs-tests/include/Makefile.am
+@@ -10,4 +10,4 @@ dist_pkgdata_SCRIPTS = \
+ EXTRA_DIST=default.cfg.in
+ 
+ distclean-local::
+-	-$(RM) $(dist_pkgdata_SCRIPTS)
++	-$(RM) default.cfg
+-- 
+2.11.0
+
diff --git a/debian/patches/series b/debian/patches/series
index 6d58744..e4189aa 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,4 +7,5 @@ enable-zed.patch
 0008-dracut-make-module-setup.sh-shebang-explicit.patch
 0009-add-man-page-reference-to-systemd-units.patch
 0010-fix-install-path-of-zpool.d-scripts.patch
+0001-Fix-bug-in-distclean-which-removes-needed-files.patch
 2000-increase-default-zcmd-allocation-to-256K.patch

-- 
UNNAMED PROJECT