diff --git a/zfs-patches/0037-Revert-cherry-pick-fix-distclean-which-removes-neede.patch b/zfs-patches/0037-Revert-cherry-pick-fix-distclean-which-removes-neede.patch new file mode 100644 index 0000000..e9e421a --- /dev/null +++ b/zfs-patches/0037-Revert-cherry-pick-fix-distclean-which-removes-neede.patch @@ -0,0 +1,73 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= +Date: Wed, 21 Feb 2018 09:40:06 +0100 +Subject: [PATCH] Revert "cherry-pick: fix distclean which removes needed + files" +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This reverts commit b7361d56f7039ad69e93e3e9b647da69b5fb647a. + +Signed-off-by: Fabian Grünbichler +--- + ...g-in-distclean-which-removes-needed-files.patch | 36 ---------------------- + debian/patches/series | 1 - + 2 files changed, 37 deletions(-) + delete mode 100644 debian/patches/0001-Fix-bug-in-distclean-which-removes-needed-files.patch + +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 +deleted file mode 100644 +index e16758b03..000000000 +--- a/debian/patches/0001-Fix-bug-in-distclean-which-removes-needed-files.patch ++++ /dev/null +@@ -1,36 +0,0 @@ +-From b1490dd43e3c98649c7d23928d908f5bb019411b Mon Sep 17 00:00:00 2001 +-From: David Quigley +-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 +-Reviewed-by: Brian Behlendorf +-Reviewed-by: Giuseppe Di Natale +-Signed-off-by: David Quigley +-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 e4189aa05..6d5874440 100644 +--- a/debian/patches/series ++++ b/debian/patches/series +@@ -7,5 +7,4 @@ 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 +-- +2.14.2 + diff --git a/zfs-patches/series b/zfs-patches/series index 65ad06a..78ecd28 100644 --- a/zfs-patches/series +++ b/zfs-patches/series @@ -34,3 +34,4 @@ 0034-Extend-zloop.sh-for-automated-testing.patch 0035-Fix-zfs-receive-o-when-used-with-e-d.patch 0036-Tag-zfs-0.7.6.patch +0037-Revert-cherry-pick-fix-distclean-which-removes-neede.patch