diff options
author | Ross Burton <ross.burton@arm.com> | 2022-09-05 11:19:53 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-09-08 14:59:39 +0100 |
commit | 1e73562ea7472604094cd084ae8f208a38dab545 (patch) | |
tree | 80e75d88070c630d4ebd7659b0dc82f6fe69976c /meta/recipes-devtools/xmlto/xmlto_0.0.28.bb | |
parent | bdd91aa3886fb9c1115e69bd4bf7d03bfaf0720b (diff) | |
download | poky-1e73562ea7472604094cd084ae8f208a38dab545.tar.gz |
xmlto: remove redundant patches
0001-Skip-validating-xmlto-output isn't needed as xmllint will use the
local catalogues correctly now[1].
configure.in-drop-the-test-of-xmllint-and-xsltproc can be dropped if we
pre-load the result of AC_PATH_PROG with ac_cv_path_XMLLINT.
[1] oe-core 8159b47e7ddddaca57ade2ecf24d8ff9a0abf26a
(From OE-Core rev: 0fecb0c86303cb0b54c0f3986176b27f0647d6a3)
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/xmlto/xmlto_0.0.28.bb')
-rw-r--r-- | meta/recipes-devtools/xmlto/xmlto_0.0.28.bb | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/meta/recipes-devtools/xmlto/xmlto_0.0.28.bb b/meta/recipes-devtools/xmlto/xmlto_0.0.28.bb index 373eca2454..5e3fac7a60 100644 --- a/meta/recipes-devtools/xmlto/xmlto_0.0.28.bb +++ b/meta/recipes-devtools/xmlto/xmlto_0.0.28.bb | |||
@@ -8,10 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" | |||
8 | 8 | ||
9 | SRCREV = "6fa6a0e07644f20abf2596f78a60112713e11cbe" | 9 | SRCREV = "6fa6a0e07644f20abf2596f78a60112713e11cbe" |
10 | UPSTREAM_CHECK_COMMITS = "1" | 10 | UPSTREAM_CHECK_COMMITS = "1" |
11 | SRC_URI = "git://pagure.io/xmlto.git;protocol=https;branch=master \ | 11 | SRC_URI = "git://pagure.io/xmlto.git;protocol=https;branch=master" |
12 | file://configure.in-drop-the-test-of-xmllint-and-xsltproc.patch \ | ||
13 | file://0001-Skip-validating-xmlto-output.patch \ | ||
14 | " | ||
15 | S = "${WORKDIR}/git" | 12 | S = "${WORKDIR}/git" |
16 | 13 | ||
17 | PV .= "+0.0.29+git${SRCPV}" | 14 | PV .= "+0.0.29+git${SRCPV}" |
@@ -34,11 +31,11 @@ RDEPENDS:${PN}:append:class-target = " \ | |||
34 | libxslt-bin \ | 31 | libxslt-bin \ |
35 | coreutils \ | 32 | coreutils \ |
36 | " | 33 | " |
37 | CACHED_CONFIGUREVARS += "ac_cv_path_TAIL=tail ac_cv_path_GREP=grep" | 34 | CACHED_CONFIGUREVARS += "ac_cv_path_TAIL=tail ac_cv_path_GREP=grep ac_cv_path_XMLLINT=xmllint ac_cv_path_XSLTPROC=xsltproc" |
38 | 35 | ||
39 | BBCLASSEXTEND = "native" | 36 | BBCLASSEXTEND = "native" |
40 | 37 | ||
41 | EXTRA_OECONF:append = " BASH=/bin/bash GCP=/bin/cp XMLLINT=xmllint XSLTPROC=xsltproc" | 38 | EXTRA_OECONF:append = " BASH=/bin/bash GCP=/bin/cp" |
42 | 39 | ||
43 | do_configure:prepend() { | 40 | do_configure:prepend() { |
44 | (cd ${S} && flex -o xmlif/xmlif.c xmlif/xmlif.l) | 41 | (cd ${S} && flex -o xmlif/xmlif.c xmlif/xmlif.l) |