Return-Path: Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) by mail.openembedded.org (Postfix) with ESMTP id 2F31F7D38D for ; Wed, 3 Apr 2019 17:04:17 +0000 (UTC) Received: by mail-wm1-f41.google.com with SMTP id h18so9251538wml.1 for ; Wed, 03 Apr 2019 10:04:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=FbFPAX3eyAw5RY0LRET3sg05QG8np52IS8v6mfofu1U=; b=qP+W1A+Jeywo+p8W6k4lPcU/zqZnmIbfToGa+5waXHmHn1MnwrDknZQw0X7rlUklvM itONezsEi+RqHQwcXl5oaQGTXqTEHOR+X3F25H7NI2Kkejtw4DH2S6iLzVFGNu1GIG2C VVdO03p/U9fQyxtKMWZtx3wFaZBxAgOuqici5TV5L0p2AFwzC8RTlR+dY9+Hg8GH6MFk t7HrIJ+3QH5lPKfhEs402hnlPmn3XCVGVnvfTTmWNHL8ywakiXHGqokyWuGEhFjyUsvf 7jQefJqF4Bdm28SRfJGBt978Rfl2ZcvLcucHBizPADC/Pifz5eE0rmXPWcnFQKJ2x1fp Zbfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=FbFPAX3eyAw5RY0LRET3sg05QG8np52IS8v6mfofu1U=; b=GDGJlx6m20vkb1j+TJ/ctszhGNCPNWql+VjvJV1ikSxCz7XvCf8ZK+y7p6Iow0hnxz UomAd2+ihjO3Q9v6GV5HdGoFMlxTbydhVbIBqHiHjv1V2XfV4txyV8i+DJYEg/t46Y/D lxXCAf7ERFTld8WFr/EGO1xxggosgFHwDHfZQhNPWVO+jmQEWEnITEDvTI9Lq8Y/v1+7 F1J0eS2E0COqg/FRNH+Pxf7wcYrTCOLGKc1AdXUzK+4TmHkYbo+fiiqn7JFSFJvG9i37 6ssaXWQM1VAmbXbAraAa3n+aoEorN/0F/9VdlZBErORzOL/mrLswWbrvCzo+xRgncHf0 NCAA== X-Gm-Message-State: APjAAAWd/rFGq5cAiqQ3JpKE2plMkwToQWvZoDy/GQOLDnLMnTJXvENS 9Ic01E9RT71wMAC23p/xBRrwn8FgpBI= X-Google-Smtp-Source: APXvYqwFt+I4J7P32bQmTyDRVrhQHuCatbjflSj1TM0NlShBwGTUhEv6pcF+EeeqlWAk8cEVahr3NQ== X-Received: by 2002:a1c:f205:: with SMTP id s5mr735856wmc.124.1554311057544; Wed, 03 Apr 2019 10:04:17 -0700 (PDT) Received: from flashheart.burtonini.com (35.106.2.81.in-addr.arpa. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id o17sm17362170wrw.73.2019.04.03.10.04.16 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Apr 2019 10:04:16 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Wed, 3 Apr 2019 18:04:05 +0100 Message-Id: <20190403170412.23568-2-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190403170412.23568-1-ross.burton@intel.com> References: <20190403170412.23568-1-ross.burton@intel.com> Subject: [PATCH 2/9] docbook-xml: use xmlcatalog class X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Apr 2019 17:04:17 -0000 Instead of shipping a static catalog and patching it for native builds, use libxml2-native to generate a catalog with the correct paths. Use the xmlcatalog class to register this catalog automatically. Signed-off-by: Ross Burton --- .../docbook-xml/docbook-xml-dtd4/docbook-xml.xml | 68 ---------------------- .../docbook-xml/docbook-xml-dtd4_4.5.bb | 25 ++++---- 2 files changed, 12 insertions(+), 81 deletions(-) delete mode 100644 meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/docbook-xml.xml diff --git a/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/docbook-xml.xml b/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/docbook-xml.xml deleted file mode 100644 index b71f559ef53..00000000000 --- a/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/docbook-xml.xml +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 da62b77a602..4b6a28e34c3 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 @@ -8,13 +8,14 @@ HOMEPAGE = "http://www.docbook.org/xml/" LICENSE = "OASIS" LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE-OASIS;md5=c608985dd5f7f215e669e7639a0b1d2e" +DEPENDS = "libxml2-native" + # 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 \ - file://docbook-xml.xml \ " SRC_URI[md5sum] = "487b4d44e15cffb1f4048af23f98208e" @@ -22,7 +23,7 @@ SRC_URI[sha256sum] = "b0f8edcf697f5318e63dd98c9a931f3fee167af0805ba441db372e0f17 UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/d/docbook-xml/" -S="${WORKDIR}/docbook-xml-4.5.c31424" +S = "${WORKDIR}/docbook-xml-4.5.c31424" inherit allarch BBCLASSEXTEND = "native" @@ -36,20 +37,18 @@ do_compile (){ } do_install () { - # Refer debian https://packages.debian.org/sid/all/docbook-xml/filelist + 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 - install -d -m 755 ${D}${datadir}/xml/docbook/schema/dtd/${DTDVERSION} - cp -v -R docbook-${DTDVERSION}/* ${D}${datadir}/xml/docbook/schema/dtd/${DTDVERSION} + 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 - - install -d ${D}${sysconfdir}/xml/ - install -m 755 ${WORKDIR}/docbook-xml.xml ${D}${sysconfdir}/xml/docbook-xml.xml } -do_install_append_class-native () { - # Ensure that the catalog file sgml-docbook.cat is properly - # updated when the package is installed from sstate cache. - sed -i -e "s|file://.*/usr/share/xml|file://${datadir}/xml|g" ${D}${sysconfdir}/xml/docbook-xml.xml -} +XMLCATALOGS = "${sysconfdir}/xml/docbook-xml.xml" +inherit xmlcatalog FILES_${PN} = "${datadir}/* ${sysconfdir}/xml/docbook-xml.xml" -- 2.11.0