From patchwork Thu Apr 4 22:16:39 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 161809 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp2140845jan; Thu, 4 Apr 2019 15:17:20 -0700 (PDT) X-Google-Smtp-Source: APXvYqzWvxRehOOBh0700e2jvlj8jSECpCTYZ9kT60EuQ/kDMSqcYICm00VO5z/dY9MkSsY9ySCn X-Received: by 2002:a63:ce45:: with SMTP id r5mr8292183pgi.330.1554416240637; Thu, 04 Apr 2019 15:17:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1554416240; cv=none; d=google.com; s=arc-20160816; b=SMAeVYa1hQHJfGj7q3xojxTtgivJrgzjjs0FzX6tPvr3Q4k4+RX2SU7AbOXmryBzmA Rw6wCbMizLJ42FMpzFUKGijMsOo1WDsHNEKnai6t3f9JrrrFDvPlR4wtGadsy635wHzL Z7+QX9Yk5C6zFDhXk6wwFc5/VNs7PEB96IIREiSWRefZ8p7aB043Tq3uw3qcYKxikHb4 sf6cT7rAige2VLlvHG7oTmdHQYU5QmWX3RhiFkB2r0c+z0h3csrlWzCaPuRliX9e+Gos mE91wYj14kK4xMg/TJD39iaGLoITwZOYwKZ3GPUPYH0SG1LK0ir/xSoUNUpid5fPV/hR kYiQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=9WwGNZYjZMBcKrYwIaIcncdx8TXg/+qEE9jJZrrR1AU=; b=sAJVm8HSAOULozqklN303y6zVLWX/r522ddjZmUtvFXBNDKvi2q5Hp5/qUdlxYby+S cy60KQC1y7w9Uxur3nLDfldeLuPjKwHLPPyiTx9bpOvYiDEBRWnIjnAc2+an5GPwq+Od 0rsckOfra4Ou5feHPtEol4dtH186xK3/+Mf366Ynw+8bdo4h6F9x2MSDMF/Mi8HV8rbK VepcpYYhHMFrKvW0eoOGJx1PJkAXqdqJej4/PNTGgf5LgaeMxTpD90GfjtXDR/c3mtQd LL88lAMh6guQAKvMqN3Bnn5rjhMl9tvcUR8gv9kLk39LU8eQ+xe3QaMkjMVUdb6R1jSG r7IQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=DGEOSuTz; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id k193si17777166pfc.150.2019.04.04.15.17.20; Thu, 04 Apr 2019 15:17:20 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=DGEOSuTz; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from ec2-34-214-78-129.us-west-2.compute.amazonaws.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 558487D48E; Thu, 4 Apr 2019 22:17:09 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) by mail.openembedded.org (Postfix) with ESMTP id E35387D45D for ; Thu, 4 Apr 2019 22:16:55 +0000 (UTC) Received: by mail-wm1-f49.google.com with SMTP id z11so4775452wmi.0 for ; Thu, 04 Apr 2019 15:16:57 -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=ioUUZBGRteS5T22R/hNDRLSHmEgvF1kfWemI3ZH0niQ=; b=DGEOSuTzT4eLwc2JNvaWQdaD6ePSMrT8p4Zx8LsglvpB20HxsNK+WVedAK2OGv4waA m3XdrH4598xC3Erika3tcZje36B7OD1c3fW0bNprUcfyVdxO2ZTOku5LymnUe/T5v6jT Fa4NcnP24KCrHn8lXWzkIVeaZZb5bTOclMJ0yrCL3qYNl4I1BTn7tqGbTWhD/qEyNdkg YZneboTqIG+O7X9JdihTxmSQPj/YdNRWV1BBWC4llfZxbwNi03HN52igOo4+5R4uJCjS bWrz4Y15mqE0Hb68LDIVAyKIbT9DMJzG7bhSGHqd+LKfwBGFum5ZUPiadm70dPtX+rvl vaFA== 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=ioUUZBGRteS5T22R/hNDRLSHmEgvF1kfWemI3ZH0niQ=; b=stc0+p9ddyNDxbOACuSGDkIVc0HeKuquCy4tAwslUp6/SHyK5PaDzpWeM0PCFLX7Tc 2UkCwaOCdFAl5K/wp0EJM4ndXaZiQ6fCl0gayFwZ+9hD0XvJeBQ97qslNJCEMgZBwYZa TreC9LndJE+IdLAzhMTXZfzDlIDaopN/IKmntcHpQBPnJfTsgEDwdJKM7AXixTig/Q1R EcRZtwotTNLnYd4PQAUkEpDa5IxmJ0fOXVXpc0eP6mXxIo5tr7znYaECXzdvvNLGyACi o4nmnyn+cR4pDvl0/hqjZI8pmRRoon1wC0fKd6CajSWwr+HBxw0I6QLOSSNEaIW0rBz7 5K2A== X-Gm-Message-State: APjAAAXdMmopT8VVw8Bz6dh/rErI7qzQiAogmCPmnrpf4E5f1Il171Qt 9uvhTJfZi8EqhzKBKpNf2nnzSJXQavg= X-Received: by 2002:a1c:ac07:: with SMTP id v7mr5994257wme.49.1554416216414; Thu, 04 Apr 2019 15:16:56 -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 d3sm305565wmf.46.2019.04.04.15.16.55 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 04 Apr 2019 15:16:55 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Thu, 4 Apr 2019 23:16:39 +0100 Message-Id: <20190404221644.20496-4-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190404221644.20496-1-ross.burton@intel.com> References: <20190404221644.20496-1-ross.burton@intel.com> Subject: [OE-core] [PATCH v2 4/9] docbook-xsl: use xmlcatalog 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: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org There is no need to ship a static catalog that we have to patch, as upstream comes with a catalog fragment. Use the xmlcatalog class to register this catalog. Signed-off-by: Ross Burton --- .../docbook-xsl-stylesheets/docbook-xsl.xml | 6 ------ .../docbook-xml/docbook-xsl-stylesheets_1.79.1.bb | 21 +++++++-------------- 2 files changed, 7 insertions(+), 20 deletions(-) delete mode 100644 meta/recipes-devtools/docbook-xml/docbook-xsl-stylesheets/docbook-xsl.xml -- 2.11.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-devtools/docbook-xml/docbook-xsl-stylesheets/docbook-xsl.xml b/meta/recipes-devtools/docbook-xml/docbook-xsl-stylesheets/docbook-xsl.xml deleted file mode 100644 index c60555ae149..00000000000 --- a/meta/recipes-devtools/docbook-xml/docbook-xsl-stylesheets/docbook-xsl.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/meta/recipes-devtools/docbook-xml/docbook-xsl-stylesheets_1.79.1.bb b/meta/recipes-devtools/docbook-xml/docbook-xsl-stylesheets_1.79.1.bb index 036fc15dc9a..ff38e874b3e 100644 --- a/meta/recipes-devtools/docbook-xml/docbook-xsl-stylesheets_1.79.1.bb +++ b/meta/recipes-devtools/docbook-xml/docbook-xsl-stylesheets_1.79.1.bb @@ -4,7 +4,6 @@ LICENSE = "XSL" LIC_FILES_CHKSUM = "file://COPYING;md5=6beadd98f9c54ab0c387e14211ee4d0e" SRC_URI = "${SOURCEFORGE_MIRROR}/docbook/docbook-xsl-${PV}.tar.bz2 \ - file://docbook-xsl.xml \ file://docbook-xsl-stylesheets-no-bashism-in-docbook-xsl-up.patch \ " @@ -15,10 +14,11 @@ UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/docbook/files/docbook-xsl/ # Reject versions ending in .0 as those are release candidates UPSTREAM_CHECK_REGEX = "/docbook-xsl/(?P(\d+[\.\-_]*)+(?!\.0)\.\d+)/" +DEPENDS = "libxml2-native" + S = "${WORKDIR}/docbook-xsl-${PV}" -inherit allarch -BBCLASSEXTEND = "native" +inherit allarch xmlcatalog do_configure (){ : @@ -29,8 +29,6 @@ do_compile (){ } do_install () { - # Refer to http://www.linuxfromscratch.org/blfs/view/stable/pst/docbook-xsl.html - # for details. install -v -m755 -d ${D}${datadir}/xml/docbook/xsl-stylesheets-${PV} ln -s xsl-stylesheets-${PV} ${D}${datadir}/xml/docbook/xsl-stylesheets @@ -44,17 +42,12 @@ do_install () { install -d ${D}${docdir}/${BPN} install -v -m644 README RELEASE-NOTES* NEWS* ${D}${docdir}/${BPN} - - install -d ${D}${sysconfdir}/xml/ - install -m 755 ${WORKDIR}/docbook-xsl.xml ${D}${sysconfdir}/xml/docbook-xsl.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-xsl.xml } RDEPENDS_${PN} += "perl" FILES_${PN} = "${datadir}/xml/* ${sysconfdir}/xml/docbook-xsl.xml" FILES_${PN}-doc = "${datadir}/doc/*" + +XMLCATALOGS = "${datadir}/xml/docbook/xsl-stylesheets-${PV}/catalog.xml" + +BBCLASSEXTEND = "native"