diff options
| author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2020-01-08 21:23:22 +0000 |
|---|---|---|
| committer | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2020-01-08 21:23:22 +0000 |
| commit | 70a61c71d34433ae379367b6f6365d7ec7988d27 (patch) | |
| tree | 4a6e8de18b6916c2e90ab64a9c90ace8a48bcba0 /user/btrfs-progs/asciidoctor-build.patch | |
| parent | 999bf9b0f1676d84456a5d1edf0d0ace03b27d6f (diff) | |
| download | packages-70a61c71d34433ae379367b6f6365d7ec7988d27.tar.gz packages-70a61c71d34433ae379367b6f6365d7ec7988d27.tar.bz2 packages-70a61c71d34433ae379367b6f6365d7ec7988d27.tar.xz packages-70a61c71d34433ae379367b6f6365d7ec7988d27.zip | |
user/btrfs-progs: Bump to 5.4
Diffstat (limited to 'user/btrfs-progs/asciidoctor-build.patch')
| -rw-r--r-- | user/btrfs-progs/asciidoctor-build.patch | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/user/btrfs-progs/asciidoctor-build.patch b/user/btrfs-progs/asciidoctor-build.patch new file mode 100644 index 000000000..d7eedc406 --- /dev/null +++ b/user/btrfs-progs/asciidoctor-build.patch @@ -0,0 +1,40 @@ +From ecf430c2e1c6e070542e4b2425318febd5c97261 Mon Sep 17 00:00:00 2001 +From: "A. Wilcox" <AWilcox@Wilcox-Tech.com> +Date: Wed, 8 Jan 2020 15:19:02 -0600 +Subject: [PATCH] Documentation: Don't erase XMLTO_EXTRA contents + +XMLTO_EXTRA is defined above, and then appended to if `asciidoctor` is +used to generate the manual pages. The second definition was clearing +the value of this variable, which caused builds with asciidoctor to +fail with: + +``` + [XMLTO] btrfs-ioctl.3 +xmlto: /usr/src/packages/user/btrfs-progs/src/btrfs-progs-v5.4/Documentation/btrfs-ioctl.xml does not validate (status 3) +xmlto: Fix document syntax or use --skip-validation option +validity error : no DTD found! +Document /usr/src/packages/user/btrfs-progs/src/btrfs-progs-v5.4/Documentation/btrfs-ioctl.xml does not validate +make[1]: *** [Makefile:114: btrfs-ioctl.3] Error 13 +``` + +Fixes: 669f56177 ("btrfs-progs: docs: use docbook5 backend for asciidoctor") +Signed-off-by: A. Wilcox <AWilcox@Wilcox-Tech.com> +--- + Documentation/Makefile.in | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/Documentation/Makefile.in b/Documentation/Makefile.in +index 0cc65398..d35cb858 100644 +--- a/Documentation/Makefile.in ++++ b/Documentation/Makefile.in +@@ -66,7 +66,6 @@ ASCIIDOC_DEPS = + endif + + MANPAGE_XSL = manpage-normal.xsl +-XMLTO_EXTRA = + INSTALL = @INSTALL@ + RM = @RM@ + RMDIR = @RMDIR@ +-- +2.24.1 + |