diff options
-rw-r--r-- | meta/recipes-devtools/xmlto/xmlto/0001-Skip-validating-xmlto-output.patch | 29 | ||||
-rw-r--r-- | meta/recipes-devtools/xmlto/xmlto/configure.in-drop-the-test-of-xmllint-and-xsltproc.patch (renamed from meta/recipes-devtools/xmlto/xmlto-0.0.28/configure.in-drop-the-test-of-xmllint-and-xsltproc.patch) | 6 | ||||
-rw-r--r-- | meta/recipes-devtools/xmlto/xmlto_0.0.28.bb | 16 |
3 files changed, 44 insertions, 7 deletions
diff --git a/meta/recipes-devtools/xmlto/xmlto/0001-Skip-validating-xmlto-output.patch b/meta/recipes-devtools/xmlto/xmlto/0001-Skip-validating-xmlto-output.patch new file mode 100644 index 0000000000..c6857a9da5 --- /dev/null +++ b/meta/recipes-devtools/xmlto/xmlto/0001-Skip-validating-xmlto-output.patch | |||
@@ -0,0 +1,29 @@ | |||
1 | From 3deb7a0eded04ab08a9cb2d88526cb1c7b440061 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sun, 14 Aug 2022 00:23:29 -0700 | ||
4 | Subject: [PATCH] Skip validating xmlto output | ||
5 | |||
6 | Avoids network access | ||
7 | |||
8 | Upstream-Status: Submitted [https://pagure.io/xmlto/pull-request/11] | ||
9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
10 | --- | ||
11 | Makefile.am | 2 +- | ||
12 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
13 | |||
14 | diff --git a/Makefile.am b/Makefile.am | ||
15 | index 50fa279..6a2da62 100644 | ||
16 | --- a/Makefile.am | ||
17 | +++ b/Makefile.am | ||
18 | @@ -68,7 +68,7 @@ EXTRA_DIST = xmlto.spec \ | ||
19 | doc/xmlif.xml \ | ||
20 | xmlto.mak | ||
21 | |||
22 | -GEN_MANPAGE = FORMAT_DIR=$(top_srcdir)/format $(BASH) ./xmlto -o $(@D) man $< | ||
23 | +GEN_MANPAGE = FORMAT_DIR=$(top_srcdir)/format $(BASH) ./xmlto --skip-validation -o $(@D) man $< | ||
24 | man/man1/xmlto.1: doc/xmlto.xml ; $(GEN_MANPAGE) | ||
25 | man/man1/xmlif.1: doc/xmlif.xml ; $(GEN_MANPAGE) | ||
26 | |||
27 | -- | ||
28 | 2.37.2 | ||
29 | |||
diff --git a/meta/recipes-devtools/xmlto/xmlto-0.0.28/configure.in-drop-the-test-of-xmllint-and-xsltproc.patch b/meta/recipes-devtools/xmlto/xmlto/configure.in-drop-the-test-of-xmllint-and-xsltproc.patch index 6d547a6c99..7cc3cbe0fb 100644 --- a/meta/recipes-devtools/xmlto/xmlto-0.0.28/configure.in-drop-the-test-of-xmllint-and-xsltproc.patch +++ b/meta/recipes-devtools/xmlto/xmlto/configure.in-drop-the-test-of-xmllint-and-xsltproc.patch | |||
@@ -9,9 +9,9 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | |||
9 | configure.in | 4 ++-- | 9 | configure.in | 4 ++-- |
10 | 1 file changed, 2 insertions(+), 2 deletions(-) | 10 | 1 file changed, 2 insertions(+), 2 deletions(-) |
11 | 11 | ||
12 | diff --git a/configure.in b/configure.in | 12 | diff --git a/configure.ac b/configure.ac |
13 | --- a/configure.in | 13 | --- a/configure.ac |
14 | +++ b/configure.in | 14 | +++ b/configure.ac |
15 | @@ -42,10 +42,10 @@ AC_ARG_VAR([LOCALE], [Name and path of the `locale' program.]) | 15 | @@ -42,10 +42,10 @@ AC_ARG_VAR([LOCALE], [Name and path of the `locale' program.]) |
16 | AC_PATH_PROG([LOCALE], [locale], [locale]) | 16 | AC_PATH_PROG([LOCALE], [locale], [locale]) |
17 | 17 | ||
diff --git a/meta/recipes-devtools/xmlto/xmlto_0.0.28.bb b/meta/recipes-devtools/xmlto/xmlto_0.0.28.bb index 5cb9a4c57b..373eca2454 100644 --- a/meta/recipes-devtools/xmlto/xmlto_0.0.28.bb +++ b/meta/recipes-devtools/xmlto/xmlto_0.0.28.bb | |||
@@ -6,17 +6,21 @@ LICENSE = "GPL-2.0-only" | |||
6 | 6 | ||
7 | LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" | 7 | LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" |
8 | 8 | ||
9 | SRC_URI = "https://releases.pagure.org/xmlto/xmlto-${PV}.tar.gz \ | 9 | SRCREV = "6fa6a0e07644f20abf2596f78a60112713e11cbe" |
10 | UPSTREAM_CHECK_COMMITS = "1" | ||
11 | SRC_URI = "git://pagure.io/xmlto.git;protocol=https;branch=master \ | ||
10 | file://configure.in-drop-the-test-of-xmllint-and-xsltproc.patch \ | 12 | file://configure.in-drop-the-test-of-xmllint-and-xsltproc.patch \ |
13 | file://0001-Skip-validating-xmlto-output.patch \ | ||
11 | " | 14 | " |
12 | SRC_URI[md5sum] = "a1fefad9d83499a15576768f60f847c6" | 15 | S = "${WORKDIR}/git" |
13 | SRC_URI[sha256sum] = "2f986b7c9a0e9ac6728147668e776d405465284e13c74d4146c9cbc51fd8aad3" | 16 | |
17 | PV .= "+0.0.29+git${SRCPV}" | ||
14 | 18 | ||
15 | inherit autotools | 19 | inherit autotools |
16 | 20 | ||
17 | CLEANBROKEN = "1" | 21 | CLEANBROKEN = "1" |
18 | 22 | ||
19 | DEPENDS = "libxml2-native" | 23 | DEPENDS = "libxml2-native libxslt-native flex-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native" |
20 | 24 | ||
21 | RDEPENDS:${PN} = "docbook-xml-dtd4 \ | 25 | RDEPENDS:${PN} = "docbook-xml-dtd4 \ |
22 | docbook-xsl-stylesheets \ | 26 | docbook-xsl-stylesheets \ |
@@ -36,6 +40,10 @@ BBCLASSEXTEND = "native" | |||
36 | 40 | ||
37 | EXTRA_OECONF:append = " BASH=/bin/bash GCP=/bin/cp XMLLINT=xmllint XSLTPROC=xsltproc" | 41 | EXTRA_OECONF:append = " BASH=/bin/bash GCP=/bin/cp XMLLINT=xmllint XSLTPROC=xsltproc" |
38 | 42 | ||
43 | do_configure:prepend() { | ||
44 | (cd ${S} && flex -o xmlif/xmlif.c xmlif/xmlif.l) | ||
45 | } | ||
46 | |||
39 | do_install:append:class-native() { | 47 | do_install:append:class-native() { |
40 | create_wrapper ${D}${bindir}/xmlto XML_CATALOG_FILES=${sysconfdir}/xml/catalog | 48 | create_wrapper ${D}${bindir}/xmlto XML_CATALOG_FILES=${sysconfdir}/xml/catalog |
41 | } | 49 | } |