docbook-xml: update recipe to stick with the upstream
PATCH 1/1 docbook-xml: update recipe to stick with the upstream
From: Gregor Zatko <[email protected]>
Until now a Debian package has been used as a source. This change just switches it to project's upstream.
https://bugzilla.yoctoproject.org/show_bug.cgi?id=13270
Signed-off-by Gregor Zatko <[email protected]>
--- .../docbook-xml/docbook-xml-dtd4_4.5.bb | 60 +++++++++---------- 1 file changed, 29 insertions(+), 31 deletions(-)
meta/recipes-devtools/docbook-xml/docbook-xml-dtd4_4.5.bb +29 -31
@@ -1,52 +1,50 @@ SUMMARY = "Document type definitions for verification of XML data files" DESCRIPTION = "Document type definitions for verification of XML data \ -files against the DocBook rule set, it ships with the latest DocBook 4.5 \ -XML DTD, as well as a selected set of legacy DTDs for use with older \ -documents, including 4.0, 4.1.2, 4.2, 4.3 and 4.4" -HOMEPAGE = "http://www.docbook.org/xml/" +files against the DocBook rule set. It ships with the latest DocBook 4.5 \ +XML DTD." +HOMEPAGE = "https://www.docbook.org/xml/" + +PR = "r1" LICENSE = "OASIS" LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE-OASIS;md5=c608985dd5f7f215e669e7639a0b1d2e" +ARCHIVE_NAME = "docbook-xml-${PV}.zip" + # Note: the upstream sources are not distributed with a license file. # LICENSE-OASIS is included as a "patch" to workaround this. When # upgrading this recipe, please verify whether this is still needed. -SRC_URI = "http://snapshot.debian.org/archive/debian/20160728T043443Z/pool/main/d/docbook-xml/docbook-xml_${PV}.orig.tar.gz \ - file://LICENSE-OASIS \ - file://docbook-xml-update-catalog.xml.patch \ +SRC_URI = "\ + https://docbook.org/xml/${PV}/${ARCHIVE_NAME} \ + file://LICENSE-OASIS \ " +SRC_URI[md5sum] = "03083e288e87a7e829e437358da7ef9e" +SRC_URI[sha256sum] = "4e4e037a2b83c98c6c94818390d4bdd3f6e10f6ec62dd79188594e26190dc7b4" -SRC_URI[md5sum] = "487b4d44e15cffb1f4048af23f98208e" -SRC_URI[sha256sum] = "b0f8edcf697f5318e63dd98c9a931f3fee167af0805ba441db372e0f17b2a44f" - -UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/d/docbook-xml/" - -S = "${WORKDIR}/docbook-xml-4.5.c31424" +UPSTREAM_CHECK_URI = "https://docbook.org/xml/${PV}/" -inherit allarch +inherit allarch xmlcatalog BBCLASSEXTEND = "native" -do_configure (){ - : -} +# the XMLCATALOGS variable is used in xmlcatalog BB class +XMLCATALOGS = "${sysconfdir}/xml/docbook-xml.xml" -do_compile (){ - : -} +S = "${WORKDIR}" + +do_configure[noexec] = "1" +do_compile[noexec] = "1" do_install () { + install -d ${D}${sysconfdir}/xml/ xmlcatalog --create --noout ${D}${sysconfdir}/xml/docbook-xml.xml - - for DTDVERSION in 4.0 4.1.2 4.2 4.3 4.4 4.5; do - DEST=${datadir}/xml/docbook/schema/dtd/$DTDVERSION - install -d -m 755 ${D}$DEST - cp -v -R docbook-$DTDVERSION/* ${D}$DEST - xmlcatalog --verbose --noout --add nextCatalog unused file://$DEST/catalog.xml ${D}${sysconfdir}/xml/docbook-xml.xml - done + DEST=${datadir}/xml/docbook/schema/dtd/${PV} + install -d -m 755 ${D}$DEST + cp -v catalog.xml ${D}$DEST + xmlcatalog --verbose --noout --add nextCatalog unused file://$DEST/catalog.xml ${D}${sysconfdir}/xml/docbook-xml.xml } -XMLCATALOGS = "${sysconfdir}/xml/docbook-xml.xml" -inherit xmlcatalog - -FILES_${PN} = "${datadir}/* ${sysconfdir}/xml/docbook-xml.xml" +FILES_${PN} = "\ + ${datadir}/* \ + ${XMLCATALOGS} \ +"
Signature · 1 line
2.25.0
Quoted 11 lines · On Sun, 2020-02-23 at 14:22 +0100, [email protected] wrote:
From: Gregor Zatko <[email protected]>
Until now a Debian package has been used as a source. This change just switches it to project's upstream.
https://bugzilla.yoctoproject.org/show_bug.cgi?id=13270
Signed-off-by Gregor Zatko <[email protected]>--- .../docbook-xml/docbook-xml-dtd4_4.5.bb | 60 +++++++++---------- 1 file changed, 29 insertions(+), 31 deletions(-)
I know this was discussed in the bug and the older entries were removed as a test. Unfortunately this does break builds:
https://autobuilder.yoctoproject.org/typhoon/#/builders/23/builds/1851
(so far)
We may need to rethink that.
Cheers,
Richard