Revert manpage patch

Apparently the zfs 0.7.0 tarball was patched!
pull/155/head
Jesus Alvarez 8 years ago
parent 3dc1da7128
commit eea1f5c7dc
  1. 31
      src/zfs-utils/0001-Correct-man-page-generation.patch
  2. 8
      src/zfs-utils/PKGBUILD.sh

@ -1,31 +0,0 @@
From 0f69f42b43637548bec225ed25fa71b032de114e Mon Sep 17 00:00:00 2001
From: bunder2015 <omfgbunder@gmail.com>
Date: Thu, 27 Jul 2017 22:06:34 -0400
Subject: [PATCH] Correct man page generation
Reviewed-by: Giuseppe Di Natale <dinatale2@llnl.gov>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: George Melikov <mail@gmelikov.ru>
Signed-off-by: bunder2015 <omfgbunder@gmail.com>
Closes #6409
Closes #6410
---
man/man8/Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/man/man8/Makefile.am b/man/man8/Makefile.am
index fa58a628d..422d3e666 100644
--- a/man/man8/Makefile.am
+++ b/man/man8/Makefile.am
@@ -4,7 +4,7 @@ dist_man_MANS = \
vdev_id.8 \
zdb.8 \
zfs.8 \
- zgenhostid.8
+ zgenhostid.8 \
zinject.8 \
zpool.8 \
zstreamdump.8
--
2.13.2

@ -13,13 +13,11 @@ url="http://zfsonlinux.org/"
source=("${zfs_src_target}"
"zfs-utils.bash-completion-r1"
"zfs-utils.initcpio.install"
"zfs-utils.initcpio.hook"
"0001-Correct-man-page-generation.patch")
"zfs-utils.initcpio.hook")
sha256sums=("${zfs_src_hash}"
"${zfs_bash_completion_hash}"
"${zfs_initcpio_install_hash}"
"${zfs_initcpio_hook_hash}"
"1059516f60c74ddb6e90d32b0581ac31a497fcff87015cf7716861dedc06cab3")
"${zfs_initcpio_hook_hash}")
license=("CDDL")
groups=("${archzfs_package_group}")
provides=("zfs-utils")
@ -29,8 +27,6 @@ ${zfs_utils_replaces}
build() {
cd "${zfs_workdir}"
# This can be removed when OpenZFS version 0.7.1 is released
patch -p1 -i < "\${srcdir}/0001-Correct-man-page-generation.patch"
./autogen.sh
./configure --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin --with-mounthelperdir=/usr/bin \\
--libdir=/usr/lib --datadir=/usr/share --includedir=/usr/include \\

Loading…
Cancel
Save