[OE-core] [PATCH] asciidoc: disable xmllint check

Burton, Ross ross.burton at intel.com
Thu Apr 4 07:30:57 UTC 2019


I've submitted fixes for this already.

Ross

On Thu, 4 Apr 2019 at 07:12, <mingli.yu at windriver.com> wrote:
>
> From: Mingli Yu <Mingli.Yu at windriver.com>
>
> asciidoc-native build with below error when
> there is no xmllint program located on build
> host:
> | python3 a2x.py -f manpage doc/asciidoc.1.txt
> | a2x: ERROR: "xmllint" --nonet --noout --valid "/build/tmp/work/x86_64-linux/asciidoc-native/8.6.9+py3-gitAUTOINC+618f6e6f6b-r0/git/doc/asciidoc.1.xml" returned non-zero exit status 4
> |
> | Makefile:110: recipe for target 'doc/asciidoc.1' failed
>
> Considering it's only used to check the xml format
> of the doc file as doc/asciidoc.1.txt, so disable
> xmllint check to fix the above issue.
>
> Signed-off-by: Mingli Yu <Mingli.Yu at windriver.com>
> ---
>  meta/recipes-extended/asciidoc/asciidoc_8.6.9.bb   |  4 ++-
>  .../0001-Makefile.in-disable-xmllint-check.patch   | 38 ++++++++++++++++++++++
>  2 files changed, 41 insertions(+), 1 deletion(-)
>  create mode 100644 meta/recipes-extended/asciidoc/files/0001-Makefile.in-disable-xmllint-check.patch
>
> diff --git a/meta/recipes-extended/asciidoc/asciidoc_8.6.9.bb b/meta/recipes-extended/asciidoc/asciidoc_8.6.9.bb
> index d0d1517..7e00b34 100644
> --- a/meta/recipes-extended/asciidoc/asciidoc_8.6.9.bb
> +++ b/meta/recipes-extended/asciidoc/asciidoc_8.6.9.bb
> @@ -8,7 +8,9 @@ LICENSE = "GPLv2"
>  LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b \
>                      file://COPYRIGHT;md5=029ad5428ba5efa20176b396222d4069"
>
> -SRC_URI = "git://github.com/asciidoc/asciidoc-py3;protocol=https"
> +SRC_URI = "git://github.com/asciidoc/asciidoc-py3;protocol=https \
> +           file://0001-Makefile.in-disable-xmllint-check.patch \
> +"
>  SRCREV = "618f6e6f6b558ed1e5f2588cd60a5a6b4f881ca0"
>  PV .= "+py3-git${SRCPV}"
>
> diff --git a/meta/recipes-extended/asciidoc/files/0001-Makefile.in-disable-xmllint-check.patch b/meta/recipes-extended/asciidoc/files/0001-Makefile.in-disable-xmllint-check.patch
> new file mode 100644
> index 0000000..4c0dd6d
> --- /dev/null
> +++ b/meta/recipes-extended/asciidoc/files/0001-Makefile.in-disable-xmllint-check.patch
> @@ -0,0 +1,38 @@
> +From 242e58f16c129f5983d6b32d493619cc4f87703e Mon Sep 17 00:00:00 2001
> +From: Mingli Yu <Mingli.Yu at windriver.com>
> +Date: Thu, 4 Apr 2019 13:38:10 +0800
> +Subject: [PATCH] Makefile.in: disable xmllint check
> +
> +asciidoc-native build with below error when
> +there is no xmllint program located on build
> +host:
> +| python3 a2x.py -f manpage doc/asciidoc.1.txt
> +| a2x: ERROR: "xmllint" --nonet --noout --valid "/build/tmp/work/x86_64-linux/asciidoc-native/8.6.9+py3-gitAUTOINC+618f6e6f6b-r0/git/doc/asciidoc.1.xml" returned non-zero exit status 4
> +|
> +| Makefile:110: recipe for target 'doc/asciidoc.1' failed
> +
> +So disable xmllint check to fix the above issue.
> +
> +Upstream-Status: Inappropriate [oe build specific]
> +
> +Signed-off-by: Mingli Yu <Mingli.Yu at windriver.com>
> +---
> + Makefile.in | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/Makefile.in b/Makefile.in
> +index ffba3b5..fb95fab 100644
> +--- a/Makefile.in
> ++++ b/Makefile.in
> +@@ -107,7 +107,7 @@ $(DATATARGETS): % : %dir
> +       $(INSTALL_DATA) $($@) $(DESTDIR)/$($<)/
> +
> + $(manp): %.1 : %.1.txt
> +-      python3 a2x.py -f manpage $<
> ++      python3 a2x.py -L -f manpage $<
> +
> + docs:
> +       $(INSTALL) -d $(DESTDIR)/$(docdir)
> +--
> +2.7.4
> +
> --
> 2.7.4
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core


More information about the Openembedded-core mailing list