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>
This commit is contained in:
Ross Burton
2022-09-05 11:19:53 +01:00
committed by Richard Purdie
parent bdd91aa388
commit 1e73562ea7
3 changed files with 3 additions and 65 deletions

View File

@@ -8,10 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
SRCREV = "6fa6a0e07644f20abf2596f78a60112713e11cbe"
UPSTREAM_CHECK_COMMITS = "1"
SRC_URI = "git://pagure.io/xmlto.git;protocol=https;branch=master \
file://configure.in-drop-the-test-of-xmllint-and-xsltproc.patch \
file://0001-Skip-validating-xmlto-output.patch \
"
SRC_URI = "git://pagure.io/xmlto.git;protocol=https;branch=master"
S = "${WORKDIR}/git"
PV .= "+0.0.29+git${SRCPV}"
@@ -34,11 +31,11 @@ RDEPENDS:${PN}:append:class-target = " \
libxslt-bin \
coreutils \
"
CACHED_CONFIGUREVARS += "ac_cv_path_TAIL=tail ac_cv_path_GREP=grep"
CACHED_CONFIGUREVARS += "ac_cv_path_TAIL=tail ac_cv_path_GREP=grep ac_cv_path_XMLLINT=xmllint ac_cv_path_XSLTPROC=xsltproc"
BBCLASSEXTEND = "native"
EXTRA_OECONF:append = " BASH=/bin/bash GCP=/bin/cp XMLLINT=xmllint XSLTPROC=xsltproc"
EXTRA_OECONF:append = " BASH=/bin/bash GCP=/bin/cp"
do_configure:prepend() {
(cd ${S} && flex -o xmlif/xmlif.c xmlif/xmlif.l)