From patchwork Thu Apr 4 22:16:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 161806 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp2140372jan; Thu, 4 Apr 2019 15:16:53 -0700 (PDT) X-Google-Smtp-Source: APXvYqxEWwL8VWZ1//3GvrNqYGNIsJh24HfMvVEE3Konh7iXzrxX69CZgg+D70Y+09aWf3BO9t0b X-Received: by 2002:a63:945:: with SMTP id 66mr7973651pgj.128.1554416213016; Thu, 04 Apr 2019 15:16:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1554416213; cv=none; d=google.com; s=arc-20160816; b=unQojbOdfFyt2t/wyIWih5uCgPHkijppe3H2vhoG9iy8+MuO/PXl0SbBgo9Yt0RVfv qDpUmFCkfrZMKsYfiigyveAKfc1vslVtmA/bMbUnZqsjHEBbcHzP1lAp6yy6K99le3n1 dd7+zVXxnPmPQXuNrFfsQ02ue9FxfcTtTcdrgQNR/m/lAAOHhb5+4e+SGdX8PaA2Z014 5BEu0idSHo43xwiXazXczHWQ1dpopKKvAf78Sf7AF/RNd1ZtYMdtDKtooYe8ODyadNuB vwa8Gb36wmTGwQyfRxXI4Ed1yVddKMA+pKLE5w+GidOn3YFOWQ1G0g4m6dJv7ugvcgr3 c2Yg== 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=zX0PcUjXh6qVTsjwrDuY8ri3EKej7OD2KtopzE8N6m8=; b=mka2cXO1b3exgF8bu9j3b12hQVntf/alQfutttrVOGPS/o6MYSQQr39i21JG+ve5pI rDjTgIfFkqmtlZHuKKt0VCWdLX92t6QlHlF++QPa8liSpAseq8YnTQTD5AU45uPWU8Ev edeAUgywhncvagRJ8TwzzrTrJQwk72dFxhi1OIAodw+YYyLpjSD6l4lmFnIxwngj+FlY pu83F+U0fL1EyYXSLrb53jsbYs9yhgJItXGRKIwN6WnKqbGuPDA3BhAI6k3FPqJmj/69 OrFIx0IebnW5+VhV4ds82hkh1Y1hu8TRQXv9xffNJl47jozlPQU5ZlzCOpSo8QRR0L7H 68Ig== 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=pwIJQW2J; 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 k8si9172326plt.354.2019.04.04.15.16.52; Thu, 04 Apr 2019 15:16:53 -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=pwIJQW2J; 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 932297D48E; Thu, 4 Apr 2019 22:16:48 +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 B7FB37D48E for ; Thu, 4 Apr 2019 22:16:46 +0000 (UTC) Received: by mail-wr1-f52.google.com with SMTP id k17so5633108wrx.10 for ; Thu, 04 Apr 2019 15:16:48 -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=aEZhCNHqa6dNeNskT1gxqE9D2qhmhannGPNzbFGD0FY=; b=pwIJQW2J6DkNzTKQFIzgicSJR4emAvrBQoa992mx02dvfiJZUk7nFuhA/VGBDYSh2n ihrMGIO6NIkg3wJRPLFmpZhOpSGdCFMobUwlycy26ewZM/CJ1UENrdSOiPSukAN1iyZO 8IX79MpH4FJOulne+VOL2hAg/CW3kcyw7Hkj9tZq9YrzH89JDdg32BQCf8mqcZQ7AxYp Ok7RI4LFa/iFryloBuaJiuBYpWLRp/KJLRxLeTDc5tjFWwqa8iCd+1HTLPSL7TOfNDzD UckYSvCLjRUfVQEPCSjg2FC8P2l42gaNZwwtubs6lH1tDSE+CeRLs8BSZiV9OteW6N1S S37A== 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=aEZhCNHqa6dNeNskT1gxqE9D2qhmhannGPNzbFGD0FY=; b=kJcKSDrDnRr9q9n+loaAF4iVxsEBJGNO4VV4f2feteM1Tml3uP6pl1GXYBTy3iSEGf X4jS2cT83NZ+Oct8zc9bm8Lijw5Ne0/FZxZX07mpnuy1T8xk1IhAMpQYK1SpF0G4kfue ayFe2dhWh22ABAl+kOewAzQDsRwPiMCdKoX3LbuBiY/t+2RPz1P91oMjfQrU9lBYrl0T mVQv0k+Y9SP3vKRv4AByf54gqYezzm0P8OvJQoLk6ujn/Vbbk3EPIoTPdtqhacUOGr3k n3OXy+YIao1YF2TMiCwr062YGtSy7vXc3sEK2b6nnib65mpN+oPYrAmB845tYtXW2lb2 r9pA== X-Gm-Message-State: APjAAAWj9hx5D6OAAKmgJQfjA+znysHReCqNdPtV35szPmD8n0lIdXAS plMV9i4r6D7PLMN1v7WvPWObR3X8cQ8= X-Received: by 2002:adf:fd46:: with SMTP id h6mr5962870wrs.139.1554416207033; Thu, 04 Apr 2019 15:16:47 -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.45 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 04 Apr 2019 15:16:46 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Thu, 4 Apr 2019 23:16:36 +0100 Message-Id: <20190404221644.20496-1-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 Subject: [OE-core] [PATCH v2 1/9] xmlcatalog: new class to update the 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 This is a new class to handle recipes that need to add/remove entries in the XML Catalog(ue)[1]. In the future it will handle updating the catalogue on the target, but the immediate requirement is during the build so currently this only works with native recipes. Note that as this is a new class and target use hasn't been implemented yet, it is possible that the behaviour of this class will change. [1] https://en.wikipedia.org/wiki/XML_catalog Signed-off-by: Ross Burton --- meta/classes/xmlcatalog.bbclass | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 meta/classes/xmlcatalog.bbclass -- 2.11.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/classes/xmlcatalog.bbclass b/meta/classes/xmlcatalog.bbclass new file mode 100644 index 00000000000..075aef8c0c4 --- /dev/null +++ b/meta/classes/xmlcatalog.bbclass @@ -0,0 +1,24 @@ +# A whitespace-separated list of XML catalogs to be registered, for example +# "${sysconfdir}/xml/docbook-xml.xml". +XMLCATALOGS ?= "" + +SYSROOT_PREPROCESS_FUNCS_append = " xmlcatalog_sstate_postinst" + +xmlcatalog_complete() { + ROOTCATALOG="${STAGING_ETCDIR_NATIVE}/xml/catalog" + if [ ! -f $ROOTCATALOG ]; then + mkdir --parents $(dirname $ROOTCATALOG) + xmlcatalog --noout --create $ROOTCATALOG + fi + for CATALOG in ${XMLCATALOGS}; do + xmlcatalog --noout --add nextCatalog unused file://$CATALOG $ROOTCATALOG + done +} + +xmlcatalog_sstate_postinst() { + mkdir -p ${SYSROOT_DESTDIR}${bindir} + dest=${SYSROOT_DESTDIR}${bindir}/postinst-${PN}-xmlcatalog + echo '#!/bin/sh' > $dest + echo '${xmlcatalog_complete}' >> $dest + chmod 0755 $dest +} From patchwork Thu Apr 4 22:16:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 161807 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp2140616jan; Thu, 4 Apr 2019 15:17:07 -0700 (PDT) X-Google-Smtp-Source: APXvYqzKeFeqzrfOgLC4U1wcdiCyjxAln2yOPDq1Fqk/AOKWf+/hqII835X4s+xwYaEbkQ3uk2CQ X-Received: by 2002:a62:e315:: with SMTP id g21mr8572283pfh.2.1554416227764; Thu, 04 Apr 2019 15:17:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1554416227; cv=none; d=google.com; s=arc-20160816; b=FF55NhAZbFOGKWqQcmtDs0CR39+LblIT3u4LOdUVt30rjrKejieViit10VHLo90M0n l4avRRIgils3u3cTnRs5joVgpjmpgbFwnhBfRfvHBR8XLCXWVv9NOHH95Eba5Kc0mz+B ZX9PmrKoFAiEj5Vvtg6nrjiD5+7JQpswhQ+PWJESmnvhHj7bWtfhZLGdhRPjQ6cS2piC TPDbblv081WoQ37PdomVm1AiFREPQItQNEjeOL1E48VGUQCMt/3l2aJncat/C68EeYhd APEszoSw8qrK9tcyLgSNylJFXz5VTMJ/lFBYLXJ06EgWCUPBdYfvzLi82/ACAGN4kx1U hdvQ== 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=kLFAwbuFHWZYSkjxHhjHRGAba/ew/RR7ciDN1vMKr44=; b=esGlN+vd5KhBxY6riCJWycU3Er/5n23flt1lcxv1NRqF7gzk/Rkh9ez5M1z3MZa19V cLyfGoO+ubgtthA8ENmCz62N0kdJTHceCi4Dp9q8z5t4QJf7rZUTwUPDYIEcf+yc3kOy bJ/qw7o1FaJyjlK6Z3wXLoi5Qvh+fTmjjz/nx6BG5WYkBRKSOuvdj8eKmK2ioYmwfxZ9 SL2s/+ErElwsPvoZSx2NJ2pz4DdGcbI6QP3jxsCkYmSFs9jlEzPBlPjYWLDB5VucukxY S/v+BCEA7VV7NsT5tDprdwUphVUHdynnL4DW7kKLB5grUqdmzc+7KnFoiiwdZalg8Zd2 Oe2g== 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=ZKCBD5PS; 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 a23si16846321pls.188.2019.04.04.15.17.07; Thu, 04 Apr 2019 15:17:07 -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=ZKCBD5PS; 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 2CE4B7D4DE; Thu, 4 Apr 2019 22:17:05 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by mail.openembedded.org (Postfix) with ESMTP id 804D67D4D7 for ; Thu, 4 Apr 2019 22:16:53 +0000 (UTC) Received: by mail-wr1-f65.google.com with SMTP id p10so5700600wrq.1 for ; Thu, 04 Apr 2019 15:16:54 -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=ZKCBD5PS2oUGqDuzKQzCd48TJV2bsbaXOcHsxg2P9mIgZQvV4tVnAYVB0l7KDvgst+ 3twI+fpU+vj49Vre+54Zq4F9eHa8w/kxi/IzQE5YTA9QAtVDN2rGVuJNFoIAwN4uO8u9 Nk9Q/2MciMix3piygJRThzfwzRkgmzFXdUMcBdim5AIR746vJF9JSP8/HVc76l7+c2m/ lJYAV8tcFLlhd9x5LzwKnWQj5dJw8/3LwrpTpWFJQSWYuIRZ6OlnTxtlYLkpyWUmFFmi rGLaxBgEDeEq81tNoXCm84ir5N6ICkWUHbfGYcEw4NHgmHjZQNEkgPDQW3SunpZichcD F88g== 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=X9maZqeCAF618/ldYXyzWvYQQoq+dLrtaH5zEaqCsnxzg0uRuFFWcY5wJVY3movaUM oT4VGwMZ3L9noqmzxP/yQlMVpAF79bUiDbLAyaWS7/f7d4Gkm5k7UMvPcWew3/qpRCEC MpAhJN0i80G8nzjYWP28I0gbJ8t+16OveqayGcXlYeYM7s+WuqjC1Af8kceutpqf5/3h XMBmxEaErhCN0wtfOdltKr6FBMXTZeCnMFbWjyNupZDNrovW/pbajoC/ArN84co05dXv 7u1bap/0uPvBU1k+5fATaDnROR7NVZWgtt9DBpZWuB/TdAjPIBLDoqQDz+z/kNJUZVhP YsDA== X-Gm-Message-State: APjAAAWoUiuYNzqxiTq15yPmLArYqKffoauATYsiIVzs7K7/bO3wi2IY wUaBClk8D+vjKuYQ/Cj3LktSYQ/059s= X-Received: by 2002:a5d:4f11:: with SMTP id c17mr6009585wru.34.1554416213967; Thu, 04 Apr 2019 15:16:53 -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.52 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 04 Apr 2019 15:16:53 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Thu, 4 Apr 2019 23:16:37 +0100 Message-Id: <20190404221644.20496-2-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 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: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org 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 -- 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-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" From patchwork Thu Apr 4 22:16:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 161808 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp2140753jan; Thu, 4 Apr 2019 15:17:14 -0700 (PDT) X-Google-Smtp-Source: APXvYqzPrbNC9luWfUsfvzUVUwdT1x8vYyhOmezzHmznJUiyYho1V4TCv1HMu+2zfN7L+pHPvWsx X-Received: by 2002:a63:1a1b:: with SMTP id a27mr8217894pga.59.1554416234855; Thu, 04 Apr 2019 15:17:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1554416234; cv=none; d=google.com; s=arc-20160816; b=ldpPWL2dalzn3WB/v3/3wYC/2s3mF1Pxcy1txYaB8JvySGGRaCv9QGpHPwXZBwqXJO Yjc8KMHFE202POCKJRbabLAFfk7eKWzqyJ4YcYHsC27WHz6dseMQVyF1UldTHOUaKCDs f7+KxkbfaMPibUjdnQN/3nWZg6MOoI82jnN74/rVAqQhQRlNXzPaBqfIlCmZPnlT3Dlb TFIOpnfRmsBbxpVuZqGmkhJdfNpU9Md8JvsKTglPrjVr/v3s2TUgeNEul3OIcKxs8w9H mGubHvjlEy+YggGlboWyV3jQo2TixiF3CGpjhhWtCNQ+6W6MH7a+wCBedf+1Jpk60cxe UlJg== 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=rTQuJogfMAZHESTC71KSbbPzep6YJzLrfmrZOfVZAMU=; b=L157BqmwoLVsC+OmQPCdRQsTOBZ0sdfsepDRcPH3Wzpp7ijCvURIVE1AgSMnV9/XOh ITbVYFw73lVsl1M0s2xlRYvAPElkJ26f9lNsoY28OQS7hg4ppopxtm36mBXQ8RHkXdva CGnzv31CnMZ77x0ZLS0hbRjNefLk4Szu2M/XCTi6u1mv9vy1SYKLVyI7ZQVSJPDLUxWQ i9UtGwiHkX9kJcuLAthXaqxLQiwVp+gbK4Ona0m9rcKDlWS0f3kODREJIcAGes0ZFqAg o8/Kp4gU5RU2txFigqLKNAFpBg91esGldc10SimWr1MzHW4aj2w+vC/KXUkfOf4GaCf5 LNzw== 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=aOrfEk19; 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 q13si16936251pls.284.2019.04.04.15.17.14; Thu, 04 Apr 2019 15:17:14 -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=aOrfEk19; 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 0130A7D4DA; Thu, 4 Apr 2019 22:17:08 +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 F130F7D4DF for ; Thu, 4 Apr 2019 22:16:54 +0000 (UTC) Received: by mail-wm1-f49.google.com with SMTP id o25so4710563wmf.5 for ; Thu, 04 Apr 2019 15:16:56 -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=DP9gkBZ0QS3eV0UU9cObdwlPqWzcrGyJ/0rF5WBQFkY=; b=aOrfEk19puO8pTcyfHF0EIMyoiUSTPFF3MMybxvOcvtGH/m3Vvei6kRPZaTdzrLsuN 55h2TLoHSdu6rbH2JygNvdeRbDhUF1cRfGcKsblezYfJM88gbnVx1BaiRQbgCRUgxpYf oygpnw47ziGvdSDfUwewxD4WqpOsBdOM1iW8AFcB6Otd6Acv2PRAGlWdLioGzOs7gQpT bwzAMkC8wSWov3qrsWAI8xu+DXhX5GRFptw1uDI+s7U68pRGt3e3FB90arGDHM+dSmn/ J2YGn9ybIFWfxxpIIsUx973bXfwOnmM3fRo3Ba0+3Fnpbt+zfwrlIZ+uNKd1kR2ndmTM Mmhg== 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=DP9gkBZ0QS3eV0UU9cObdwlPqWzcrGyJ/0rF5WBQFkY=; b=LAzyf7zVhNsnvgKyuwQ3ROa9BKKVB0ht9C6f0n74Kp2AH5ASgMUjOdRtrLv73ocr0a GZie8/bMPtgFWT/0a1ntzXD4L8T8BQRux7KiooqMmqUUMIZXlywkMqBm9e3k2Gj42E0O BudUYEPC9903VHKuc1snPjG1dmSSigaUA70GPeHadDnpQf9y/0QBPbXu4L28wPDYv1+O h0w5jCkMqRLibY6YGfoLNCFHniScBTGFL4kudDVsspoIfRsWd1ZSDRW9cTOOeuWsT2Zv htneKdEZ0g/dYqCeB5WUx8FQy2W0xWW5e7oJDZDrogPVatrrY7KGgSBbFBNPCpLty8Bq +RyQ== X-Gm-Message-State: APjAAAXY7YxZPmYpuA417P8ZrGHNRmjV+wPUsthQXxRlHAHLegGpzoh8 DTTtH4647ZRu0mG2NhbidGfuWQLvHLc= X-Received: by 2002:a1c:44d7:: with SMTP id r206mr5862632wma.129.1554416215013; Thu, 04 Apr 2019 15:16:55 -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.54 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 04 Apr 2019 15:16:54 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Thu, 4 Apr 2019 23:16:38 +0100 Message-Id: <20190404221644.20496-3-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 3/9] docbook-xsl: neaten documentation 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 Tidy up the install task and don't version the directory under ${docdir}. Signed-off-by: Ross Burton --- .../recipes-devtools/docbook-xml/docbook-xsl-stylesheets_1.79.1.bb | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) -- 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_1.79.1.bb b/meta/recipes-devtools/docbook-xml/docbook-xsl-stylesheets_1.79.1.bb index 07d32ce9795..036fc15dc9a 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 @@ -42,14 +42,11 @@ do_install () { ln -s VERSION ${D}/${datadir}/xml/docbook/xsl-stylesheets-${PV}/VERSION.xsl - install -v -m644 -D README \ - ${D}${datadir}/doc/docbook-xsl-${PV}/README.txt - install -v -m644 RELEASE-NOTES* NEWS* \ - ${D}${datadir}/doc/docbook-xsl-${PV} + 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 () { 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" From patchwork Thu Apr 4 22:16:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 161810 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp2140930jan; Thu, 4 Apr 2019 15:17:26 -0700 (PDT) X-Google-Smtp-Source: APXvYqz9LNBlDA73k9mobhIJHX/1hxi4t1qmKRLdWsd8O3pf/Q9KDndynx+6Ueym33JZ8y/x4cDq X-Received: by 2002:a62:1a0d:: with SMTP id a13mr8691616pfa.198.1554416246304; Thu, 04 Apr 2019 15:17:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1554416246; cv=none; d=google.com; s=arc-20160816; b=jmiXKWh89gbPRvrLgu7g6d2R5/E29E5MGB8Y/eqlmBWkptR8HMnlAk87mpy6lFpUeq JQGmNhC36Uh2+A9nToDECBfkXDQhHIIJHd6ecedgC5e5UMKIgc9DeG15tFsMeAeAz5KL rLx43wnSTkyVXkHNd/T7Qb8QtejOGJNpifRVrfWta+VbaIKxx+UuJ6Ow3y78BJ4uVAII N92Q8paknJUEALDAj/SlgKpGhe443VokdG1grBx8GnyqwIQQkVOY5vFfrZl8C5cNw6Q9 S3PRgO0wjohCpq/orYAQ1E0jtnsZ0WCtLzARGKZ2IkDPxP+9OLYfKwRhPpJAO3liPUvv M12A== 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=aW7Mt0+0mRdRVGNYNJCTvX93MiVCrhg+os47D5SuZHs=; b=OLXVTB4P1vBwnlP4RZ3/lqyF22s1Bu3eL2Qt/xLqzlLQnQJAg6HuzS1O6/Q0GzZDgm AVLyKyhkcP4a6FuzzVqU9pK4CVsEhZIkVCkuqZL4muWX+TtojNnwKq1MDw0j2HvRUIi0 c1/ftKM4mSguUVPB4ZhJ0QuRotKmQR0pPIf7YSaEu/J4QqJM2Y0M9S2QN9XMXVJ+ds5Z evhdDcZj95Jd1RSi4yb5fHRLpf31nBidWeDolyWeXBUASCYwFiMCFMMrDRCTlXFs/sva vtdAu3pjFFZ5rhHVIqNisaKPkds/wnG1W0yieU4z7t7fmIf/3YBSB1/0IcJN7uhrYsA3 UWbw== 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=kekp7Ua5; 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 f8si4714975pfd.105.2019.04.04.15.17.25; Thu, 04 Apr 2019 15:17:26 -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=kekp7Ua5; 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 715FA7D503; Thu, 4 Apr 2019 22:17:10 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) by mail.openembedded.org (Postfix) with ESMTP id E6D847D45D for ; Thu, 4 Apr 2019 22:16:56 +0000 (UTC) Received: by mail-wm1-f50.google.com with SMTP id 4so4738189wmf.1 for ; Thu, 04 Apr 2019 15:16:58 -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=i1z15cK+pxeM88okhoBfO8Cc9buWEeDOQ639wSWAEgY=; b=kekp7Ua5olx6kb5shv8lOhHmpSMkliRBhc1TVzv/0RK/J21d/b8bZ/jLeYlGFuhrbf s8NXOQ+/00yMeN/CWTWxpSio5NM4WRd5jueb9egvNVx/Ns2We5T4DO2JVs9kos7GDLSL Dj9Cc4zoKlqioV9Quji7W+3G52W52nUnw6dulbg8kkOC/zWmpTvny+nVTy+yrF/rVY+q OGibVQ9c0xWuE17AL4H3Vic7Ek3ECL/XXdrPJkLixYb0gkKVNakWGFt0NZZnWDlOcMUL po4vHmKlqhOFfUGyM6IdTr3dQFHVvMn8PQ0a18a0Zq7LShrZBuym4aPQBR09vGtzgFbO Qb5w== 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=i1z15cK+pxeM88okhoBfO8Cc9buWEeDOQ639wSWAEgY=; b=jUMyn3vqdutnOETYgNdNaoSuP41IZRbTahgpF6MdvIdZbieFrK8Z6F0txUHsbHQlMA 1UUfMfLDI3z5nOcxe++N77UyOxUG6SxmC6/zhsQkcsS5ZRdsl/1CSUHrJdHXascZST+2 Myo6PX6kKuaDomcF4osTvLG/pdt7kP7MvC22gkDgORkdLgkDH+HebzG7ep6TmLIGlGkI 6ZZv+xUVZtsDgC2zLgD0JdrjNakp2v5IW4Q8HVOmbfDlwPurNuIyhonYauZx8kzFaVhQ dBhFApyg+LQRRYsIhQRQ8SzGEr4LE6DNUGPG6O1wYswn7eAbHH7NSEarIBZ+DNemXRcg R+cQ== X-Gm-Message-State: APjAAAV4jfcymbO1ktJ9HQwZf47xObnxrOpwnogVmdBJkIfeU8lLj+1Y 46Eo8b+fLwNJR8QHMn2FAx+xMk2WOdE= X-Received: by 2002:a1c:6588:: with SMTP id z130mr5689040wmb.39.1554416217511; Thu, 04 Apr 2019 15:16:57 -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.56 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 04 Apr 2019 15:16:56 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Thu, 4 Apr 2019 23:16:40 +0100 Message-Id: <20190404221644.20496-5-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 5/9] libxslt: update for new 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 The XML catalogue is now at the canonical path, ${sysconfdir}/xml/catalog. Signed-off-by: Ross Burton --- meta/recipes-support/libxslt/libxslt_1.1.33.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 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-support/libxslt/libxslt_1.1.33.bb b/meta/recipes-support/libxslt/libxslt_1.1.33.bb index fd442d44f72..28d404ca779 100644 --- a/meta/recipes-support/libxslt/libxslt_1.1.33.bb +++ b/meta/recipes-support/libxslt/libxslt_1.1.33.bb @@ -36,9 +36,9 @@ RPROVIDES_${PN}-bin += "${PN}-utils" RCONFLICTS_${PN}-bin += "${PN}-utils" RREPLACES_${PN}-bin += "${PN}-utils" - +# This is only needed until libxml can load the relocated catalog itself do_install_append_class-native () { - create_wrapper ${D}/${bindir}/xsltproc XML_CATALOG_FILES=${sysconfdir}/xml/catalog.xml + create_wrapper ${D}/${bindir}/xsltproc XML_CATALOG_FILES=${sysconfdir}/xml/catalog } FILES_${PN} += "${libdir}/libxslt-plugins" 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 From patchwork Thu Apr 4 22:16:42 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 161812 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp2141127jan; Thu, 4 Apr 2019 15:17:38 -0700 (PDT) X-Google-Smtp-Source: APXvYqxdlJdJ+XmJf9QLZY+c0n+5E5VM4XrkftX0ww4gAfzWXFHjtjlNTms4hma0KS7Crjpzq4ze X-Received: by 2002:a63:500f:: with SMTP id e15mr8551849pgb.198.1554416258780; Thu, 04 Apr 2019 15:17:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1554416258; cv=none; d=google.com; s=arc-20160816; b=08833miP5OQOVIcmL/beJSOWNmDDdTPsx2Qr4CyiWiLmTtIIcQOVoQ0ULLTwgnJOmw 8rDtJzhr4tJbubl0ge/gR+LH80cghLbqL6l9vsfH2w7dG4d+Oj4FGqQZJvRB2Y79YkJV BzEedbo3WWO6uA4t40QWS04odmwQ7xIkLtm8N8LttKMOvjqP5sUXVGtNcLZ6+KDmRQ4v rZXUt7MmWVzKra4bbcfbtecDhEsaLYN8TqhxErTNXD0S4z1DDLOnwhYadhlNE5ADEKj+ cp22/1bY51wFCS8hgBVj1OXqWHDfsgOq6Q0uiRp4Cvi3EDSu1/iHqMrA2omxUAB0feur Ju2w== 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=J7ooMAoUJtf/1/RdKoWONqV48+cbooXTzjOt5+bhxQY=; b=MGl5r8K9y5VdKBfyR3bBF5fgHDMXPze1ElpMIsFcBpqhnMOfOs/xGFunvk5t6lWl5r UKJuItIoh1Voovdnu/PBS+ybfGfGyBDfK8ZhOrnX+2Se93dJJBCObUclNxLz9zFkPkdb 5/8H2eU8OZwE8l8KS2KBWyVm+zC9Hhj7RkGhxRByZu0MMoAqX89jAnXxp+mBokJA3oqw L+FsSp6lRAypLJ+067hZLtAnWccBxwc0vRh9gzAGo9/SGlg4E0zKLBx7o/pwMo4IXr4c D3oVE5DWHU7QFhiMeLvAlFDx4rF+xQvqLg8pIacdrYx7QD865wQaoq10zHY9vWyEFygn zaYA== 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=YCEJSSug; 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 133si18239490pfu.82.2019.04.04.15.17.38; Thu, 04 Apr 2019 15:17:38 -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=YCEJSSug; 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 B04E77D50D; Thu, 4 Apr 2019 22:17:12 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by mail.openembedded.org (Postfix) with ESMTP id 3CF117D45D for ; Thu, 4 Apr 2019 22:16:59 +0000 (UTC) Received: by mail-wm1-f66.google.com with SMTP id z11so4775590wmi.0 for ; Thu, 04 Apr 2019 15:17:00 -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=KSwQ6K0Wcg6HL8nscHk7krNotqZVfg2u/jBnfSWcbUI=; b=YCEJSSugYHGDL7gZ7ePk97MPkGqa7f8Lw7WtHGVaBwPTSBTAAekwjOrW4J+HqIkf4/ lHY3mAT9jxMrCdSjP8eXohg9p6+RaHM2UUpRTTznUA8w+2E7UXyxAq/IxukDgNnHIAf7 RUKYGM87oBixQwzbkuTo2RnA5WXrRCiYaGko7+GMCty1XCa1neqXxRHP0kicE9FQeIG0 W68yhNhhWY8WQ+5Owe7rO8tBtsyuD6wrW9hQCki3K5QU6iaQRLc2W2sYHln6rzxpyeD1 2+lp/yTIzRX5XS61NcCa76nSz/KQ/kI+0Ek+/NIg9f26B1P64TgI73K2VEMo+23OLi1X xxKw== 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=KSwQ6K0Wcg6HL8nscHk7krNotqZVfg2u/jBnfSWcbUI=; b=fhtCTHI6eIztxZbK/FSUm0qu1hppfZGXE1xmqvtZUZEY9h9cox5UwpjXrrdHkGiqcs ZLoDyLvnl7QSXK4OKpeBVFX15IxhHzdOaYxfgg1RMYyg9Ae+lSChbgqTCHjv3i0tawa+ vbYD/sInbTU9v5bb7LC/NBbwtoMeNcuxeFq6m+H/2+sHjKq+1NjUrUc9WSuRDr1Vl+dN 1sI3ZzfIVpLI3WS0U+JMTF87dHWb+GpGX/KvAgZ5eAI3TtbW3N7U3uKpcklNXochmsur vNUNk75yaQ/SdXQi6C8dJExBPtEOMlLA3tILNxXswxEtVJhDA84SemgONMVhLAZTgmFV hIlQ== X-Gm-Message-State: APjAAAV/IYUXWaDc07ETUOHIwzsn3uWgRfK+kepdv+u9NDATTGfHoGVh LWcLj9/avtWqH5//B+WFuL+YpIDnfQ4= X-Received: by 2002:a1c:c910:: with SMTP id f16mr5312230wmb.47.1554416219696; Thu, 04 Apr 2019 15:16:59 -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.58 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 04 Apr 2019 15:16:58 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Thu, 4 Apr 2019 23:16:42 +0100 Message-Id: <20190404221644.20496-7-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 7/9] xmlto: remove XML catalog 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 use the xmlcatalog class, xmlto can stop shipping a hand-coded catalogue. It still needs to keep the wrapper so that the sysroot catalog is used instead of /etc/xml/catalog. The wrapper is native-specific so mark it as such. Note that this does effectively break xmlto on the target as the xmlcatalog class doesn't write a catalog for the target yet, but I'm hoping that nobody actually uses it on target. Signed-off-by: Ross Burton --- meta/recipes-devtools/xmlto/files/catalog.xml | 19 ------------------- meta/recipes-devtools/xmlto/xmlto_0.0.28.bb | 7 ++----- 2 files changed, 2 insertions(+), 24 deletions(-) delete mode 100644 meta/recipes-devtools/xmlto/files/catalog.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/xmlto/files/catalog.xml b/meta/recipes-devtools/xmlto/files/catalog.xml deleted file mode 100644 index 6b8833d871b..00000000000 --- a/meta/recipes-devtools/xmlto/files/catalog.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/meta/recipes-devtools/xmlto/xmlto_0.0.28.bb b/meta/recipes-devtools/xmlto/xmlto_0.0.28.bb index 6216d7782be..06dc002083d 100644 --- a/meta/recipes-devtools/xmlto/xmlto_0.0.28.bb +++ b/meta/recipes-devtools/xmlto/xmlto_0.0.28.bb @@ -7,7 +7,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" SRC_URI = "https://releases.pagure.org/xmlto/xmlto-${PV}.tar.gz \ file://configure.in-drop-the-test-of-xmllint-and-xsltproc.patch \ - file://catalog.xml \ " SRC_URI[md5sum] = "a1fefad9d83499a15576768f60f847c6" SRC_URI[sha256sum] = "2f986b7c9a0e9ac6728147668e776d405465284e13c74d4146c9cbc51fd8aad3" @@ -32,10 +31,8 @@ BBCLASSEXTEND = "native" EXTRA_OECONF_append = " BASH=/bin/bash GCP=/bin/cp XMLLINT=xmllint XSLTPROC=xsltproc" -do_install_append() { - install -d ${D}${sysconfdir}/xml/ - install -m 755 ${WORKDIR}/catalog.xml ${D}${sysconfdir}/xml/catalog.xml - create_wrapper ${D}/${bindir}/xmlto XML_CATALOG_FILES=${sysconfdir}/xml/catalog.xml +do_install_append_class-native() { + create_wrapper ${D}${bindir}/xmlto XML_CATALOG_FILES=${sysconfdir}/xml/catalog } do_populate_sysroot[rdeptask] = "do_populate_sysroot" From patchwork Thu Apr 4 22:16:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 161813 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp2141221jan; Thu, 4 Apr 2019 15:17:45 -0700 (PDT) X-Google-Smtp-Source: APXvYqxexKBbHj+OkvYBjATbBD0WZJDJxHeeBX+f21Iwu1HKOMXxEWHio74FClvMn+dOymo/jqp7 X-Received: by 2002:a65:5049:: with SMTP id k9mr8492501pgo.229.1554416264946; Thu, 04 Apr 2019 15:17:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1554416264; cv=none; d=google.com; s=arc-20160816; b=QwTKtTFf/a+McYv/JK1l4I6uuMwhi705gf2YziVkc+/pQ7kWd9lUyDPedtdsKDJc9m WsAgQCfT2u+rka7qiG41b1tjWzWJwG/Z308Uz6RMweko9VjTsDrmX0bMwVtRm3mBKlmy dPblwnJy5AK2H6H2W+uL4bEKsvhnq75PcOE9AeRo6pV2kQYARtyufUXpm1BnhpCiQ1fE BA8R6bj2Fb1IyDtulvV2Jj1zEx6LgqSyp1HfeikDyvGTQCvb8fJYbmDY20lfuZ0e6zfp pwuztbl1DmQfQAwUXdVm0DV1kiQtXuG3UutF92zS6TJg8Dlt+RMhvEWtmUo7Tm/Ox2sf fKUw== 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=BJ09eAfXMiBLv7DXgHfVO3eWykGYIP71o+/CZ8q6xrY=; b=yoBg6XH97dqYGJoRwjme3GcEE/BiV0DtppZX+aCdhZ0Hh4lbDtQJTmepmzSSJf7Pak b2hrCyDad6YY9BSfS0TnwNaKv4HKJfYPql/OZafYdkKylLuW2da+/10w6nrAtx9K2F1G Uaf20ynYVOyuJZdZtbgT/qrrIadfz4fE7mQboiukUXIWJGYGjmpLDJ00w2hriAF0Au+M /6iUT6Plsu+0KzFraMMInjJ0y6KqtsNlMg8Lceh+ifQTSnBLjwonTDqUmkK0f0eOeI3M gV6laKazyLd5J8Hi9/wjClm1Xp1VOWAtOppOhbKlG7NqUFbHcpAsvFZjWICt5D54s+FW p1qA== 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=sy5fmxvt; 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 k12si17002369pgo.429.2019.04.04.15.17.44; Thu, 04 Apr 2019 15:17:44 -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=sy5fmxvt; 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 CF15D7D513; Thu, 4 Apr 2019 22:17:13 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) by mail.openembedded.org (Postfix) with ESMTP id 70F687D4E8 for ; Thu, 4 Apr 2019 22:17:00 +0000 (UTC) Received: by mail-wm1-f42.google.com with SMTP id v14so5130719wmf.2 for ; Thu, 04 Apr 2019 15:17:01 -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=TzsXPdLeVT9RiE1V3w3UloH84j7BaTunkWcNsjTVLlM=; b=sy5fmxvt4086PfKxgQmi709JMJQlPB99r0GFJHIH0VTXgNGYwe2SKd1hfSV/87tREo c+9JlEGeVMtetQTm2mA+NXRFvuTqOQzZPXLsJbaM+3uXHrpUXQA9me7RsfRaeqkpMtM7 AyEdnyuRdbQ++KQwpRzhfvrZS4WgxJgupEAGZnkQ22ViRa2jwBl9gz9EFkd+LntJTPE9 Bo6b7VNDI57lodYjVTb2nUEOAmQYBYBNqM83xkfttVPEs2lgbDhUtifzJF6Vc7ttIRH/ uhc3+cEaTrn285FDVNKSpwLeA751Eqn3970V9h97nJHev6wrgj0M4QDjwzh1EfmMlqkL qY0w== 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=TzsXPdLeVT9RiE1V3w3UloH84j7BaTunkWcNsjTVLlM=; b=AAR9GJSwDsv5QaXtN2qoWMnbtXLR5lDBiCHKNOiyzdI6WcnDBgYVUzSVywNSpx0E19 sU7PIBM6XRzyabBkGBKEibISNy/U8vZqZ+bANq9kN+xxF99j5Z/w/Jp6OLoYOsM9QXpQ PiuETNiWQJ333dGPQ6nZrs6fVUdamkezxSQbmF6n/g+CwjiiB7sc7C/E+ANp+YhNvx6+ Q7wCiDnJIiqGOUSDTVinK5dknckJtR4paP3s/+slHq4e9/WwDztamssUEwKPW9itDv9O 3sN93jIgIn3/sje77RcPe1mz8r/cmcY5vyVjTUGDadVgI5iFji8druMLnuSqSTtODqsl CEhQ== X-Gm-Message-State: APjAAAXPrJ5pORcOhcoeJlTCjNjyVTb102Ll3QNbfVDq6Mu9pQWDSq0u tIjpwJQeDcxBrJ1WL85WbJRx9q7Fzxk= X-Received: by 2002:a1c:39d7:: with SMTP id g206mr5138088wma.99.1554416220828; Thu, 04 Apr 2019 15:17:00 -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.59 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 04 Apr 2019 15:17:00 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Thu, 4 Apr 2019 23:16:43 +0100 Message-Id: <20190404221644.20496-8-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 8/9] xmlto: clean up RDEPENDS 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 Because of differences in how RDEPENDS works for native/target, add libxml2 and libxslt to RDEPENDS (so that native dependencies work), but also add libxml2-utils (for xmllint) and libxslt-bin (for xsltproc) to target RDEPENDS. Also add libxml2-native to DEPENDS as that is needed for the docbook-(xml,xsl)-native catalog to be generated. Signed-off-by: Ross Burton --- meta/recipes-devtools/xmlto/xmlto_0.0.28.bb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) -- 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/xmlto/xmlto_0.0.28.bb b/meta/recipes-devtools/xmlto/xmlto_0.0.28.bb index 06dc002083d..df798dfcdde 100644 --- a/meta/recipes-devtools/xmlto/xmlto_0.0.28.bb +++ b/meta/recipes-devtools/xmlto/xmlto_0.0.28.bb @@ -12,16 +12,18 @@ SRC_URI[md5sum] = "a1fefad9d83499a15576768f60f847c6" SRC_URI[sha256sum] = "2f986b7c9a0e9ac6728147668e776d405465284e13c74d4146c9cbc51fd8aad3" inherit autotools -RDEPENDS_class-native = "libxslt-native" -# xmlto needs getopt/xmllint/xsltproc/bash/tail at runtime +DEPENDS = "libxml2-native" + RDEPENDS_${PN} = "docbook-xml-dtd4 \ docbook-xsl-stylesheets \ util-linux \ libxml2 \ + libxslt \ bash \ " RDEPENDS_${PN}_append_class-target = " \ + libxml2-utils \ libxslt-bin \ coreutils \ " From patchwork Thu Apr 4 22:16:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 161814 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp2141296jan; Thu, 4 Apr 2019 15:17:51 -0700 (PDT) X-Google-Smtp-Source: APXvYqzPCeb11RbN8ba0yL3lodxt1CdzYSiaak/9+bkGyPBJaPUp/ShW7xHMJfO/oHtObzRnAV4T X-Received: by 2002:a17:902:7b96:: with SMTP id w22mr9130963pll.28.1554416271254; Thu, 04 Apr 2019 15:17:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1554416271; cv=none; d=google.com; s=arc-20160816; b=uqebKtsDrp1W1Mjs1iG1stbeqrXf51TbNKZaYqv9BagDfDnikAcu8Z9WP/mRWEAVl8 2EpYKr1646FQwLpwkCLSiHe89QC0wbssfN4u8hjRZUoknuVQmpoOCLjlHw1wYY/6Cov2 aOhA/elXhtLKnUeunLkQqck4EM5UX1J1yRb6Y4z5Qlfqd507S2YX/d64QjNYi05JNbrr 3+Ia5H2439azk2jM6HfbYHtXf/I2uyTz61OzyWIDONfjZVTTN8W4Je53xuqNZmIR1C7z 2mhXuLfoC4+bXfTmYfTDQE3VzaIwbYT/yV+dI15/igE9gtJ8ly+/jalNDfoR47XGcIOI r4PA== 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=A7/pnu7UnGd8wQSMJWz5CZWDAaxZCJbTsoMGWS4ma+Y=; b=G2g8TMaFHga2JYHNCbb/6EVXZHsVUUNcsWwge657CDsN7WuNIlbHoXbgvAnLrCk5zt wXEoJxREoctYJHRjBa0qDAeDsApj+eiWaqMU3eHwyp48fRygm8qobByQdBs0kh9rxyHS bzb6eL8z48xbz710yB+opD89ajbBfhWekgHfy8IHZC3hAWjJsL6FVX55O0VlECRE2uZU ygOzs/VWStVW+kcQlt6jd9RYvOcJVgVsaTa2Ee0tx9GY4lfS7zyTjjIf/HsXhXvqxhug euAFGI+3PSUOBWdcODn0wEqOXe85lTCVrsNuttUUuhxlKZpgavBMZzyneyj/Ns0TMb8L DFaw== 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=WG8sOw7H; 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 t15si17542536pgq.235.2019.04.04.15.17.50; Thu, 04 Apr 2019 15:17:51 -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=WG8sOw7H; 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 EAD317D51D; Thu, 4 Apr 2019 22:17:14 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by mail.openembedded.org (Postfix) with ESMTP id 3702B7D4E6 for ; Thu, 4 Apr 2019 22:17:01 +0000 (UTC) Received: by mail-wm1-f66.google.com with SMTP id a184so4722432wma.2 for ; Thu, 04 Apr 2019 15:17:02 -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=sL6cMEfgrpsGxEat61D3vOZQf/dnKU7lz4SXULQ2o0Q=; b=WG8sOw7Hmsd1f/s5gbTP3Lxdrk8S3wZbanpIvr9BFXmj3kfPZXb0EbXxOueK4EZQeh TEnFYXK6Y7aWd3Q2kMT2uAQ1wkw8iSeGGE2wMFHN0lggR2HaP9AxEsALX0h+uCuHoAWs nfKlnDEVpPKfK8hv7qHPWm6vNGrIT5M9KT+9fFf/URKC8TWdxl5n7M9tKNVgcAy+rMRZ JOYwmgVzQRmDsvkZ4WBt19dYkWFqRhFUVlCqOaj6IcWjZb3bxODPr5/ybpCQWhohqMUL pkfJCEruyfXHDcbUjrUVWTNslVohDBE9O7t568R4U9lnDfTN4XDQaoo+OGhjJ2Qrs4Zm 3biQ== 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=sL6cMEfgrpsGxEat61D3vOZQf/dnKU7lz4SXULQ2o0Q=; b=lzG2fV5WDVG+oo5X/YF9nSIvaQIgMeqRh5rb08H4sfDR9txsiY7wMrTKFHNm1nTKZx GgZTprymsAygCJ10cKlRliy48ITb5dkcaJhSymNG8Vx7AK4KXHyTW9Fje6XFmifzbU1K g7d3ek7bfIxBrtl2uR5AKrGo99NK2b9x4DwNwPS9JO1S6/3Fojil2xa1tKbfxPl7LOCB 2EEcb1bWBVoq/RLXFLjf36uSbrYdtxjZTQN+AcUAy4iA9rwbc97D2hb7O50n+znau/dk a+mBEBeP2oatJ9gsOblRShWEuKDnx/G4A8zDlOV5N9kmEqqiR+8isFkwuIsIy9SWyQgR K30Q== X-Gm-Message-State: APjAAAVnFOnwr661mSmEDoIan1RxrAyEqUK5uat5L0+Kv/Vbof2s3m1Q yGi1Lq1tFWaORSMc25H3Lnf0K1RFrM0= X-Received: by 2002:a1c:5588:: with SMTP id j130mr5581927wmb.72.1554416221870; Thu, 04 Apr 2019 15:17:01 -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.17.00 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 04 Apr 2019 15:17:01 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Thu, 4 Apr 2019 23:16:44 +0100 Message-Id: <20190404221644.20496-9-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 9/9] gtk+: update for new 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 The XML catalogue is now at the canonical path, ${sysconfdir}/xml/catalog. Signed-off-by: Ross Burton --- meta/recipes-gnome/gtk+/gtk+.inc | 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-gnome/gtk+/gtk+.inc b/meta/recipes-gnome/gtk+/gtk+.inc index 14ed8d812ca..d6d14a79d5a 100644 --- a/meta/recipes-gnome/gtk+/gtk+.inc +++ b/meta/recipes-gnome/gtk+/gtk+.inc @@ -26,7 +26,7 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'directfb x11', d)}" PACKAGECONFIG[x11] = "--with-x=yes --with-gdktarget=x11,--with-x=no,${X11DEPENDS}" # without --with-gdktarget=directfb it will check for cairo-xlib which isn't available without X11 DISTRO_FEATURE PACKAGECONFIG[directfb] = "--with-gdktarget=directfb,,directfb" -PACKAGECONFIG[manpages] = "--enable-man --with-xml-catalog=${STAGING_ETCDIR_NATIVE}/xml/catalog.xml, --disable-man, libxslt-native xmlto-native" +PACKAGECONFIG[manpages] = "--enable-man --with-xml-catalog=${STAGING_ETCDIR_NATIVE}/xml/catalog, --disable-man, libxslt-native xmlto-native" inherit autotools gtk-doc pkgconfig update-alternatives gtk-immodules-cache gobject-introspection manpages