[oe-commits] [openembedded-core] 18/19: docbook-xml: update recipe to stick with the upstream
git at git.openembedded.org
git at git.openembedded.org
Tue Feb 25 10:53:47 UTC 2020
This is an automated email from the git hooks/post-receive script.
rpurdie pushed a commit to branch master-next
in repository openembedded-core.
commit bc7fd1153be96d7f0d769fd5b44497c51ab929a1
Author: Gregor Zatko <gzatko at zoznam.sk>
AuthorDate: Sun Feb 23 14:22:57 2020 +0100
docbook-xml: update recipe to stick with the upstream
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 <gzatko at gmail.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
.../docbook-xml/docbook-xml-dtd4_4.5.bb | 60 +++++++++++-----------
1 file changed, 29 insertions(+), 31 deletions(-)
diff --git a/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4_4.5.bb b/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4_4.5.bb
index 6452c8d..dbea697 100644
--- a/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4_4.5.bb
+++ b/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4_4.5.bb
@@ -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} \
+"
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Openembedded-commits
mailing list