From patchwork Tue Apr 2 15:25:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 161630 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp1879406jan; Tue, 2 Apr 2019 08:25:21 -0700 (PDT) X-Google-Smtp-Source: APXvYqx8gtgMR4MZTgCURg3llUPTWjv288JS9bhv+e7nMg5EJ7jVlKvMHPlCvZbjjR3nNbH9BLLY X-Received: by 2002:a17:902:586:: with SMTP id f6mr69741299plf.68.1554218721408; Tue, 02 Apr 2019 08:25:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1554218721; cv=none; d=google.com; s=arc-20160816; b=R5g6ysogeUPcCbsl/98RoDqwH+0e61Kopo6L9JlUcf+1FSNJN3Df0t6iylIDvsCKvc 0z2Nu3vSwGS2XbrRw/y6d+VHFmNsaah6f6Vz3pfPdlH4A8LlwHYtPbZ6rMcv4uNA6Sji WHhiSpS82URTjoB4f6+SrnZFYK3ato3KSEVTBhmyLroq1e8C7Q9fBU6eWruPOB4N7Z9y 75hugw9/nO0n8S9OePm8orC0GFwSfYfTeCpWI9wQzs+/6UKx2NRpL+9fqutJP3K5xvm5 xrTsNV8Mg5GBlMT6WtByqh08dJaKI5EpCWGmldJ2RUd5MbKP5JNBUB45/r7IyPhzGvIK CTfQ== 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:message-id:date:to:from:dkim-signature :delivered-to; bh=ZTV/YACoaHcUtn9kJ1u0zPJu1abv0Sf95NuEgywIegc=; b=wOkhpd3lK1+mdRv9CdfJdVcPpnRIME4ZAvrNoqzaHoQa9K1FwhknyKyyQtn7aarPJD 5F/+GTAZI6deLrlpA4NbJhEM6gifz+WNf4617jrKJ7jyU9MgcwpNBriZ45+rUxjIV+2I 9lfZijh0NjtaOUzkEijjt5YtbnA+3IgAKCoOZMsnu+EuHYwLhkLRkLlcUZ5OGjXTCqP5 BtbiZz4xdGqUIJDz5EsW1eRUpzVB8pW/o2hpd3YClixdo3ZSjthcI8XFYi7yhOaS9qmZ Ortm7uCqYBpT+j2IQSilu3xdVy97DaLuaFFbsT6B/PNsLikTquFFSqxzzocHPsodkWWT /f9g== 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=WMnfLxVd; 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 d3si11315382pgd.147.2019.04.02.08.25.20; Tue, 02 Apr 2019 08:25:21 -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=WMnfLxVd; 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 A50EB7D1F1; Tue, 2 Apr 2019 15:25:17 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) by mail.openembedded.org (Postfix) with ESMTP id 617117D1DF for ; Tue, 2 Apr 2019 15:25:15 +0000 (UTC) Received: by mail-wr1-f52.google.com with SMTP id y13so17229629wrd.3 for ; Tue, 02 Apr 2019 08:25:16 -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; bh=+++zhgmdZWWGknxsKRxzUD8f/tS1BzqgDFPTyiDq9jc=; b=WMnfLxVdZFNEffV1JDqJVGbn+QbNPjgjF1orjH9Al1IF0TQDdMkcKaoDMZRZEdR3s5 0TpxwDUdLBBY1uPVobe6Q5H3kxVUNqVdIWAdxo/ZVJynW1K4GYevD24CUBqC/xK401ts 6s8Hz4ORgJGzytgEXxvvfVmWDPoD0YsVIjL1BU2lHl+3qMyrOp7OHi+2eFSjKm2BwM88 M07szs6AFSXHL3/j1+3b/WGEKdVKDUFMVmkHwiFoU6vBBoV2bMwxsK3wrTLQicr3N2S0 pneJsFpXoDxk4y8/S8QrYNxwEIOB47M2o0JV8UozfWd50yYRR8WM7F+6NQdB5vCttxqh Dwhw== 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; bh=+++zhgmdZWWGknxsKRxzUD8f/tS1BzqgDFPTyiDq9jc=; b=W0VaLGTzy8uSquJigYfDpLwYDdcVz29/100rGgfDhRMsNIwwHmBvfhqAIMCFeXu+9/ XIrHOqMFSnXS9++hK/KAsEFqzfOK0e2bVC2fNxTqFwIwkVN1oZ7Ex79sSUe9N+eSYVYB Lakfeym/NruI8scbk/KxY7ip1DHjDXCeF6MVHXKMyKEiyuP66TJcviKbBFWKIl3sfQ4B y2XKpNI6HyVR5HxynsjY8qwi0Sr+H0oifv5CXas4muCvUlGOsmJ6keW5C5oBYdK3wvAO GndAQ9ZRRRiJj3QxCbCl2luI6AoBFQjpcmcD8p7ItZKOyI1RYBhNcohoZj8X8mHjHgFj Uc3g== X-Gm-Message-State: APjAAAVtDBPoFlI+XhY0+GhZkxrhy7fBmOl+egfXxS2GliT3KGTZY9pX +p+lrwalLeNUNkRFZm3s2zw46AS7kl4= X-Received: by 2002:adf:f04e:: with SMTP id t14mr46682633wro.263.1554218715744; Tue, 02 Apr 2019 08:25:15 -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 q17sm11097708wrw.70.2019.04.02.08.25.14 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Apr 2019 08:25:14 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Tue, 2 Apr 2019 16:25:12 +0100 Message-Id: <20190402152512.13112-1-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 Subject: [OE-core] [PATCH] asciidoc: use local docbook XML catalogue 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 libxml-native by default uses a XML catalogue at /etc/xml/catalog, instead of the one in the sysroot. Until this is fixed (#13260) override the XML catalogue manually in the recipe. Signed-off-by: Ross Burton --- .../asciidoc/asciidoc/auto-catalogs.patch | 27 ++++++++++++++++++++++ meta/recipes-extended/asciidoc/asciidoc_8.6.9.bb | 7 +++++- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-extended/asciidoc/asciidoc/auto-catalogs.patch -- 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-extended/asciidoc/asciidoc/auto-catalogs.patch b/meta/recipes-extended/asciidoc/asciidoc/auto-catalogs.patch new file mode 100644 index 00000000000..f507080cd3c --- /dev/null +++ b/meta/recipes-extended/asciidoc/asciidoc/auto-catalogs.patch @@ -0,0 +1,27 @@ +If SGML_CATALOG_FILES is in the environment, pass --catalogs to xmllint. + +Upstream-Status: Submitted [https://github.com/asciidoc/asciidoc-py3/issues/61] +Signed-off-by: Ross Burton + +diff --git a/a2x.py b/a2x.py +index 2d7699a..5bb995f 100755 +--- a/a2x.py ++++ b/a2x.py +@@ -47,6 +47,8 @@ FOP = 'fop' # pdf generation (--fop option). + W3M = 'w3m' # primary text file generator. + LYNX = 'lynx' # alternate text file generator. + XMLLINT = 'xmllint' # Set to '' to disable. ++if "SGML_CATALOG_FILES" in os.environ: ++ XMLLINT += " --catalogs" + EPUBCHECK = 'epubcheck' # Set to '' to disable. + # External executable default options. + ASCIIDOC_OPTS = '' +@@ -634,7 +636,7 @@ class A2X(AttrDict): + shell('"%s" --backend docbook -a "a2x-format=%s" %s --out-file "%s" "%s"' % + (self.asciidoc, self.format, self.asciidoc_opts, docbook_file, self.asciidoc_file)) + if not self.no_xmllint and XMLLINT: +- shell('"%s" --nonet --noout --valid "%s"' % (XMLLINT, docbook_file)) ++ shell('%s --nonet --noout --valid "%s"' % (XMLLINT, docbook_file)) + + def to_xhtml(self): + self.to_docbook() diff --git a/meta/recipes-extended/asciidoc/asciidoc_8.6.9.bb b/meta/recipes-extended/asciidoc/asciidoc_8.6.9.bb index d0d15171ac4..88ee93bfc10 100644 --- a/meta/recipes-extended/asciidoc/asciidoc_8.6.9.bb +++ b/meta/recipes-extended/asciidoc/asciidoc_8.6.9.bb @@ -8,7 +8,8 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b \ file://COPYRIGHT;md5=029ad5428ba5efa20176b396222d4069" -SRC_URI = "git://github.com/asciidoc/asciidoc-py3;protocol=https" +SRC_URI = "git://github.com/asciidoc/asciidoc-py3;protocol=https \ + file://auto-catalogs.patch" SRCREV = "618f6e6f6b558ed1e5f2588cd60a5a6b4f881ca0" PV .= "+py3-git${SRCPV}" @@ -16,6 +17,10 @@ DEPENDS = "libxml2-native libxslt-native docbook-xml-dtd4-native" S = "${WORKDIR}/git" +# Tell xmllint where to find the DocBook XML catalogue, because right now it +# opens /etc/xml/catalog on the host. Depends on auto-catalogs.patch +export SGML_CATALOG_FILES="file://${STAGING_ETCDIR_NATIVE}/xml/docbook-xml.xml" + # Not using automake inherit autotools-brokensep CLEANBROKEN = "1"