From patchwork Thu Apr 4 22:16:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 161811 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp2141024jan; Thu, 4 Apr 2019 15:17:32 -0700 (PDT) X-Google-Smtp-Source: APXvYqyIqNiFn+Fvh55EGCWlE8j7OE4ZhrqSG5RJeMqUyj89aO+08y6iIpHCHNu11h9sITBYkMbe X-Received: by 2002:a65:5cc8:: with SMTP id b8mr8164764pgt.36.1554416252495; Thu, 04 Apr 2019 15:17:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1554416252; cv=none; d=google.com; s=arc-20160816; b=fn1LXkGzOZozd4//AVm5kMmpUiplA3gW/m3Y6W5iFPpOIaWPaTbAW3aHWrOQEberdU 6VvMlzV/pXjZh3UP/9A8gWs0bTvh2kA1D3RrOiSFNS4q6PoWpGa5vtfnYflOZYQMBKrB Y4xEn1yKUdCy78rU0OiODQ8obFolK25B5TnUjWDhO9exPJ3y71O9vioxsLs+rt+n4B2u hqpaWMnkZi2klUz9hg4wkHgMX9ABy33ltpGqmQNvkNCFXPKsjEDKfJDXY0WemORWAONw uniiilzlcEPA47qVo8oK0HOe8OYY+xStrAQKjijqpID7mhqBdYH071GlQM11LFvQSjsW Ry4A== 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=YIAHKSuc1yvYOi8PAPMVxvhTBUwAUYG9ccjZXbA5MhsH8n+sVBSXCH9WmgZHjlE2qZ YwVGtgfjLFtFHbNIh4TKimfzVcp7MaDxMFF47+vNeS3tLQ7umDeDo+d0zCg1Wp2m5uet +J5dacHKOzXh00HL0tiOxw4p39CNewI2rmhYzIZ0CglrG77DCRNiE0HTDhYmB2577g0M PED7lDYJY7dbiOrP84hPV4aGBLPbbsuTPrATfHvnA96Oj+d9+JCEd2OpFoe/WtrmgRmI fVL/xJhGxS8t0mkdt6zZFQSQj3FNqSW64PLVn8QJVgwh+alF4Gf/NAkQ7uPPlwx1xyTn fb2w== 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=TDqXPh3I; 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 v5si17126048pgb.83.2019.04.04.15.17.32; Thu, 04 Apr 2019 15:17:32 -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=TDqXPh3I; 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 99CFD7D508; Thu, 4 Apr 2019 22:17:11 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) by mail.openembedded.org (Postfix) with ESMTP id 077BA7D45D for ; Thu, 4 Apr 2019 22:16:57 +0000 (UTC) Received: by mail-wm1-f51.google.com with SMTP id r186so8300527wmf.1 for ; Thu, 04 Apr 2019 15:16:59 -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=TDqXPh3Iovou2+GkPtG9uT7rWWJ6ihv8Owbrt7CpWPqhr6kg4Y9fNl83+L2rbwjht8 7qkeYqptuLMuVXhur44XvdM2hStjFlzhtQazT3XjwZuS2veS6qBL9huE1TxiMELX8dZR f9dVLEqkX1qWxBu66gnjTFBS9E84HEwIMn/94kPNQUHPo+RQoKQ8tuuP5zMXqdUcIKfQ nw5/vJxtiWPl0662Cb//IKoC+0XDNRdxvn9ADiAr5b7SXqgTjxdsOHsatr8EFv4DNG+e 4cE2E/rtyFT7hAs9xSmXcjRs55TcVieMUSKPHKGvHS0fREip41k1wX0Jrb3nfGzuWugU z6rA== 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=Q+tYgWdHjLWv1qDThD2sPD9snqu9sGp8poo32dVB6JpOBSsdvI2VR1wQPAyIm/64d4 hasvuF9AU1gewV9xKblN1QHApfkkX1OYZ8K55SUafPF7s/JfMQ4GzX/OmSTDsu8dRjkf VSm9E9ZBehUqc5bo4C/VTX7S1Tyl317EctLJbcXW/ME1zlkfKh+zIagOv3yoUeVLgd5S 8z6GvzUZ2CoSsgUTcWM9jqJTyPr07EUbk3/YxfBr4b0Wn16sc51X6BR9v1s3kjz/z/E0 JWzU4orOn9mqRRWeGhuDle9RCqrO3i5/+RxGwCPnz2c5fFPVGCIcylbtNwA6821M8DwT W+Ew== X-Gm-Message-State: APjAAAVdMwYIxNLyTtgBlvpHhn2msufZ6dZ4xV2KhL4d+p3rTr216Gud vne0orfW2WGOWPlmIW08opji1vK9VTg= X-Received: by 2002:a1c:2d91:: with SMTP id t139mr5601035wmt.102.1554416218517; Thu, 04 Apr 2019 15:16:58 -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.57 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 04 Apr 2019 15:16:57 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Thu, 4 Apr 2019 23:16:41 +0100 Message-Id: <20190404221644.20496-6-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 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