From 09483d29812d30be5d4317e2f818d337427e02c4 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 17 Aug 2022 09:24:36 -0700 Subject: xmlto: Update to use upstream tip of trunk There are several fixes which are done to fix builds with newer compilers after 0.0.28 was releases in 2015 a long time ago. Add a patch to fix manpages builds not trying to access network during build Add UPSTREAM_CHECK_COMMITS = "1" Regenerate xmlif from lex files, before configuring the build. Run lex from sourcedir to avoid emitting absolute source paths via #line directive into generated c source file which ends up causing reproducability isssue (From OE-Core rev: 27a5000724e4f4df274279bcd801d1dc2830208e) Signed-off-by: Khem Raj Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- ....in-drop-the-test-of-xmllint-and-xsltproc.patch | 30 ---------------------- .../xmlto/0001-Skip-validating-xmlto-output.patch | 29 +++++++++++++++++++++ ....in-drop-the-test-of-xmllint-and-xsltproc.patch | 30 ++++++++++++++++++++++ meta/recipes-devtools/xmlto/xmlto_0.0.28.bb | 16 +++++++++--- 4 files changed, 71 insertions(+), 34 deletions(-) delete mode 100644 meta/recipes-devtools/xmlto/xmlto-0.0.28/configure.in-drop-the-test-of-xmllint-and-xsltproc.patch create mode 100644 meta/recipes-devtools/xmlto/xmlto/0001-Skip-validating-xmlto-output.patch create mode 100644 meta/recipes-devtools/xmlto/xmlto/configure.in-drop-the-test-of-xmllint-and-xsltproc.patch (limited to 'meta/recipes-devtools/xmlto') 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-0.0.28/configure.in-drop-the-test-of-xmllint-and-xsltproc.patch deleted file mode 100644 index 6d547a6c99..0000000000 --- a/meta/recipes-devtools/xmlto/xmlto-0.0.28/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 ---- - configure.in | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure.in b/configure.in ---- a/configure.in -+++ b/configure.in -@@ -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/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 @@ +From 3deb7a0eded04ab08a9cb2d88526cb1c7b440061 Mon Sep 17 00:00:00 2001 +From: Khem Raj +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 +--- + 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 new file mode 100644 index 0000000000..7cc3cbe0fb --- /dev/null +++ b/meta/recipes-devtools/xmlto/xmlto/configure.in-drop-the-test-of-xmllint-and-xsltproc.patch @@ -0,0 +1,30 @@ +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 +--- + 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 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" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" -SRC_URI = "https://releases.pagure.org/xmlto/xmlto-${PV}.tar.gz \ +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[md5sum] = "a1fefad9d83499a15576768f60f847c6" -SRC_URI[sha256sum] = "2f986b7c9a0e9ac6728147668e776d405465284e13c74d4146c9cbc51fd8aad3" +S = "${WORKDIR}/git" + +PV .= "+0.0.29+git${SRCPV}" inherit autotools CLEANBROKEN = "1" -DEPENDS = "libxml2-native" +DEPENDS = "libxml2-native libxslt-native flex-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native" RDEPENDS:${PN} = "docbook-xml-dtd4 \ docbook-xsl-stylesheets \ @@ -36,6 +40,10 @@ BBCLASSEXTEND = "native" EXTRA_OECONF:append = " BASH=/bin/bash GCP=/bin/cp XMLLINT=xmllint XSLTPROC=xsltproc" +do_configure:prepend() { + (cd ${S} && flex -o xmlif/xmlif.c xmlif/xmlif.l) +} + do_install:append:class-native() { create_wrapper ${D}${bindir}/xmlto XML_CATALOG_FILES=${sysconfdir}/xml/catalog } -- cgit v1.2.3-54-g00ecf