From patchwork Wed Apr 3 17:04:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 161703 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp568336jan; Wed, 3 Apr 2019 10:04:48 -0700 (PDT) X-Google-Smtp-Source: APXvYqxLDOM3qpax2wZzxnMamTBJtIaUgMTUzKqOfY9L5dS9tCrPCSyMgkJADeFnm3Hs1T/Eb92y X-Received: by 2002:a63:5d04:: with SMTP id r4mr729488pgb.117.1554311087960; Wed, 03 Apr 2019 10:04:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1554311087; cv=none; d=google.com; s=arc-20160816; b=lq4YCGC4QVbZ03CrwE6n4Zwa9OFavVz8WP033e5dfA5usKPxcJYCJUaSvUekCgOgMA 5HMef0HK29JvlDXzp2+Uwz3yWU03/dsYPEoxzfwZ54ERPQMtpcMMH3nh04ZtigBIbOEm icb/rakfS43AJPflGYm8owZVbYr2GwaFGarPxjJuiXpmXqpiIGH7UUOI1z/wKVUk8CDp SdFgrHw6jnjzx0vMGwgGLEKEb8r2P0ybGxF7AKYTCNm4hSbaRCkPlHMSW8McKASkyCt7 Zui8x4hco+clp3xBPwXedllrAAMoraPjqsxvyqkdY3QK/4JTLXG3Fewl3JCLX+X7YSBE Z7mg== 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=V7n+TPSxqNst7LjLfjN2Z8XXIl79VP7+rPifoR8MpMk=; b=FYWZNIe6YNfh/bcqnj+pKZCp/CjzETvjNkEtGJKZuqroL4Th4sGx8oSLCnb2SvrQ+z NSuAElOlxxIsXon726Yv9qoTWVzyMivTm/vZzi0R95RbbGBzlvzvh3bU3M/OQE2pq0vT goTFIaOJ0cTuZgLRzZSniwhfCcWo/0tXm2wYL6TfyXJgyboBo3j0UbHHApgZN5jxxqbE BJOARBMN2FuAnDVBAvtB13OGkqNUljOFPCVt0bqbxXv5eDpMQlNiCRfQGRKnKJFZwcH9 RUPjeL66Q53KHqwy7ZiPMXt+q7PcIg9OkvtOpCAccWxi/xiqYgVsYSEKC/RcCZGBY5vx AR3w== 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="zMIB/QEu"; 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 j133si14185673pgc.543.2019.04.03.10.04.47; Wed, 03 Apr 2019 10:04:47 -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="zMIB/QEu"; 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 537437D3D8; Wed, 3 Apr 2019 17:04:25 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) by mail.openembedded.org (Postfix) with ESMTP id 5F4A87D367 for ; Wed, 3 Apr 2019 17:04:21 +0000 (UTC) Received: by mail-wr1-f47.google.com with SMTP id g3so22402803wrx.9 for ; Wed, 03 Apr 2019 10:04:22 -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=C5h7jbzjD8KnQSu5qJjp0eSR2A0q7BDf+j6g7062WL8=; b=zMIB/QEu3p8g1ypQDuKttM326wlv5gBW8hTZjBPrrGzbUls81m4jS4lTgRiMM/tjxG YyytWpjZMZniKTwOmqA+LuNOdaGoFVT029LobIFO9VmxcG+IfRi0xghEy5iYNFz+XzqR r5gWFR7G0GCBxohDd/MlgwMR80JK/G/C/TOoiuoEPFYPWhYeWBE+Iz+t1G/O7xvGbvKX OSYPYz+0Qtp5wu/wacZQura7NHcP3TErFFMGAubdae1fUxPVe5Ll0095xFIO3qpyKuHS daKl63q7ANcuF6kMA4CkiPduL1CamjdlYG/d288BtbTfmYPRPFGNKqgPuOgAew22TFy3 gz7A== 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=C5h7jbzjD8KnQSu5qJjp0eSR2A0q7BDf+j6g7062WL8=; b=puhRmSWkyD70BwJ6oVupkS7n2Jn9MYCNR+yK/iUKv08EA/egoArvLeoPeRgJEzrAsv goAs2Zx/PyhS626yH2je9LWLVOM4sa2LInM/Ip/a4NTMRVbY5lOglbIfJxvHno242RON hH3fXnofzwusS7D/56eZMVPFzc0Kl2Vwre8I2zBMCTMiyWnebme7IdwLqs6uzLpiKa0s 1rL6apo32+hT1vnCbDKxpzOQ/hwBXCMFE9vfxRFUuXFkPiGtBnSK921uS/WMrlrFtqYg qmLb7WdndxQtxl3NFoa555KN+y1GR4QFqkPSoDIEXkutb9wN1ktEi19hu6TvI5nuB/Te Loog== X-Gm-Message-State: APjAAAXIqy+MNj7QwUJxZcP+6c0OYKKttO0KG7i7U8cCFlNUpeBhcw+h HNyhQDjfaWKtzLxxaYDs2jpvuY4xIwc= X-Received: by 2002:adf:9427:: with SMTP id 36mr501765wrq.128.1554311061973; Wed, 03 Apr 2019 10:04:21 -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.20 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Apr 2019 10:04:21 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Wed, 3 Apr 2019 18:04:09 +0100 Message-Id: <20190403170412.23568-6-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: [OE-core] [PATCH 6/9] asciidoc: use correct XML catalog path 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 Now that docbook-xml and docbook-xsl are writing catalog files, tell xmllint/xsltproc where the catalog is. Signed-off-by: Ross Burton --- meta/recipes-extended/asciidoc/asciidoc_8.6.9.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 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_8.6.9.bb b/meta/recipes-extended/asciidoc/asciidoc_8.6.9.bb index f684f12dc72..751bf0f19f7 100644 --- a/meta/recipes-extended/asciidoc/asciidoc_8.6.9.bb +++ b/meta/recipes-extended/asciidoc/asciidoc_8.6.9.bb @@ -19,7 +19,7 @@ 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 file://${STAGING_ETCDIR_NATIVE}/xml/docbook-xsl.xml" +export SGML_CATALOG_FILES="file://${STAGING_ETCDIR_NATIVE}/xml/catalog" # Not using automake inherit autotools-brokensep