projects / zfsonlinux.git / blame
| Commit | Line | Data |
|---|---|---|
| b199710a FG |
1 | From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 |
| 2 | From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com> | |
| 3 | Date: Wed, 21 Feb 2018 09:40:06 +0100 | |
| 4 | Subject: [PATCH] Revert "cherry-pick: fix distclean which removes needed | |
| 5 | files" | |
| 6 | MIME-Version: 1.0 | |
| 7 | Content-Type: text/plain; charset=UTF-8 | |
| 8 | Content-Transfer-Encoding: 8bit | |
| 9 | ||
| 10 | This reverts commit b7361d56f7039ad69e93e3e9b647da69b5fb647a. | |
| 11 | ||
| 12 | Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com> | |
| 13 | --- | |
| 14 | ...g-in-distclean-which-removes-needed-files.patch | 36 ---------------------- | |
| 15 | debian/patches/series | 1 - | |
| 16 | 2 files changed, 37 deletions(-) | |
| 17 | delete mode 100644 debian/patches/0001-Fix-bug-in-distclean-which-removes-needed-files.patch | |
| 18 | ||
| 19 | 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 | |
| 20 | deleted file mode 100644 | |
| 21 | index e16758b03..000000000 | |
| 22 | --- a/debian/patches/0001-Fix-bug-in-distclean-which-removes-needed-files.patch | |
| 23 | +++ /dev/null | |
| 24 | @@ -1,36 +0,0 @@ | |
| 25 | -From b1490dd43e3c98649c7d23928d908f5bb019411b Mon Sep 17 00:00:00 2001 | |
| 26 | -From: David Quigley <dpquigl@users.noreply.github.com> | |
| 27 | -Date: Wed, 13 Sep 2017 12:45:04 -0600 | |
| 28 | -Subject: [PATCH 001/144] Fix bug in distclean which removes needed files | |
| 29 | - | |
| 30 | -Running distclean removes the following files because of an error | |
| 31 | -in Makefile.am | |
| 32 | - | |
| 33 | -deleted: tests/zfs-tests/include/commands.cfg | |
| 34 | -deleted: tests/zfs-tests/include/libtest.shlib | |
| 35 | -deleted: tests/zfs-tests/include/math.shlib | |
| 36 | -deleted: tests/zfs-tests/include/properties.shlib | |
| 37 | -deleted: tests/zfs-tests/include/zpool_script.shlib | |
| 38 | - | |
| 39 | -Reviewed-by: George Melikov <mail@gmelikov.ru> | |
| 40 | -Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> | |
| 41 | -Reviewed-by: Giuseppe Di Natale <dinatale2@llnl.gov> | |
| 42 | -Signed-off-by: David Quigley <david.quigley@intel.com> | |
| 43 | -Closes #6636 | |
| 44 | ---- | |
| 45 | - tests/zfs-tests/include/Makefile.am | 2 +- | |
| 46 | - 1 file changed, 1 insertion(+), 1 deletion(-) | |
| 47 | - | |
| 48 | -diff --git a/tests/zfs-tests/include/Makefile.am b/tests/zfs-tests/include/Makefile.am | |
| 49 | -index 579e1356e..24633ccc3 100644 | |
| 50 | ---- a/tests/zfs-tests/include/Makefile.am | |
| 51 | -+++ b/tests/zfs-tests/include/Makefile.am | |
| 52 | -@@ -10,4 +10,4 @@ dist_pkgdata_SCRIPTS = \ | |
| 53 | - EXTRA_DIST=default.cfg.in | |
| 54 | - | |
| 55 | - distclean-local:: | |
| 56 | -- -$(RM) $(dist_pkgdata_SCRIPTS) | |
| 57 | -+ -$(RM) default.cfg | |
| 58 | --- | |
| 59 | -2.11.0 | |
| 60 | - | |
| 61 | diff --git a/debian/patches/series b/debian/patches/series | |
| 62 | index e4189aa05..6d5874440 100644 | |
| 63 | --- a/debian/patches/series | |
| 64 | +++ b/debian/patches/series | |
| 65 | @@ -7,5 +7,4 @@ enable-zed.patch | |
| 66 | 0008-dracut-make-module-setup.sh-shebang-explicit.patch | |
| 67 | 0009-add-man-page-reference-to-systemd-units.patch | |
| 68 | 0010-fix-install-path-of-zpool.d-scripts.patch | |
| 69 | -0001-Fix-bug-in-distclean-which-removes-needed-files.patch | |
| 70 | 2000-increase-default-zcmd-allocation-to-256K.patch | |
| 71 | -- | |
| 72 | 2.14.2 | |
| 73 |