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:55:51 +0100 |
commit | 0fecb0c86303cb0b54c0f3986176b27f0647d6a3 (patch) | |
tree | 96d153ce100aba6b60acfbb4a530e344cab5d6a1 /meta/recipes-devtools/xmlto | |
parent | 315cfebe77a46c868f307919d3540046a6cb8587 (diff) | |
download | openembedded-core-contrib-0fecb0c86303cb0b54c0f3986176b27f0647d6a3.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
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')
3 files changed, 3 insertions, 65 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 deleted file mode 100644 index c6857a9da5..0000000000 --- a/meta/recipes-devtools/xmlto/xmlto/0001-Skip-validating-xmlto-output.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 3deb7a0eded04ab08a9cb2d88526cb1c7b440061 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sun, 14 Aug 2022 00:23:29 -0700 -Subject: [PATCH] Skip validating xmlto output - -Avoids network access - -Upstream-Status: Submitted [https://pagure.io/xmlto/pull-request/11] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index 50fa279..6a2da62 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -68,7 +68,7 @@ EXTRA_DIST = xmlto.spec \ - doc/xmlif.xml \ - xmlto.mak - --GEN_MANPAGE = FORMAT_DIR=$(top_srcdir)/format $(BASH) ./xmlto -o $(@D) man $< -+GEN_MANPAGE = FORMAT_DIR=$(top_srcdir)/format $(BASH) ./xmlto --skip-validation -o $(@D) man $< - man/man1/xmlto.1: doc/xmlto.xml ; $(GEN_MANPAGE) - man/man1/xmlif.1: doc/xmlif.xml ; $(GEN_MANPAGE) - --- -2.37.2 - diff --git a/meta/recipes-devtools/xmlto/xmlto/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 deleted file mode 100644 index 7cc3cbe0fb..0000000000 --- a/meta/recipes-devtools/xmlto/xmlto/configure.in-drop-the-test-of-xmllint-and-xsltproc.patch +++ /dev/null @@ -1,30 +0,0 @@ -configure.in: drop the test of xmllint and xsltproc - -The test is unnecessary, the xmllint and xsltproc were explicitly -added to RDEPENDS. - -Upstream-Status: Inappropriate -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - configure.in | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac ---- a/configure.ac -+++ b/configure.ac -@@ -42,10 +42,10 @@ AC_ARG_VAR([LOCALE], [Name and path of the `locale' program.]) - AC_PATH_PROG([LOCALE], [locale], [locale]) - - AC_ARG_VAR([XMLLINT], [Name and path of the `xmllint' program.]) --AC_PATH_PROG([XMLLINT], [xmllint], [xmllint]) -+dnl AC_PATH_PROG([XMLLINT], [xmllint], [xmllint]) - - AC_ARG_VAR([XSLTPROC], [Name and path of the `xsltproc' program.]) --AC_PATH_PROG([XSLTPROC], [xsltproc], [xsltproc]) -+dnl AC_PATH_PROG([XSLTPROC], [xsltproc], [xsltproc]) - - dnl - dnl toolchains --- -1.8.1.2 - 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" 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) |