From patchwork Wed Apr 3 17:04:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 161698 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp567750jan; Wed, 3 Apr 2019 10:04:19 -0700 (PDT) X-Google-Smtp-Source: APXvYqymspYFCy2bRUzEMc9UWedDAKhbAidaqNcGw26yS04VcLipkqUacP3R7jZjN63vWay7uFYV X-Received: by 2002:a63:78ce:: with SMTP id t197mr761898pgc.314.1554311059727; Wed, 03 Apr 2019 10:04:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1554311059; cv=none; d=google.com; s=arc-20160816; b=uXTGh5Nt/N8zCI/SB8j1wx5tS4HOIwHC9OmP4i7eXCrIPmJ9LGuO5ppQg5RYrx7ZRP h8X2g4qOWtHUIJPcg5ZVi44Lux7GSluXCXDMUHMA82lN/S+lMgZxL8fud/g8zyl6Lnw8 7o1kbbdKFRDkGhCrDkR2ru+V2gn4Jn8UV4vKJWgliDwKyFW+hJqLPJG5IR3Wbz2s5rdk BP5PJYOqB5F8da9eL9N7VgDwNPF2tBtUwHwSdx62sWGJ2bGJNKlVMi8xi8gwuCaGQN6M 4o4DuGMLRmCnKOtLQr7UwsC0w0msKPOcE+j19jeb6M8xogpT98mLyi+Z3gjhCO7QFE9r xNFg== 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=N2htFL0SP6yP2qi0GqXI6ht0iCUFDUbrwg4e1MrUha4=; b=k9roaasocDMMPfk3bijUL51XGlMUxKVXx6tbXLcz13zhW4c/9S7pRYL4z9E+aJD3Qm jRQHg7wifAO/ce44jtGUsWri4hM2tK2bn2NH95CgXWa2mKO0uOuMkOjYhSiBXlFRvQEx GSpNV6CRNv/PIS2z0CuBP4oAVEppZpN/E9XlCkZ3cUjcsf+sV6+2ygNiWOvy+oPA9FU+ TRSzQGOS9cMh6dhO0Z384JyTu/+1kxSzVtnu4AppE0tpzPkq5RL0onc69IhnnXwApn9m 7PHw5d2VNHn8nPVOa+kEDAu8+li6MXjs8MYvpL2BhaMCXlTiYWZJNF+ysZTxp+G098nG sSUg== 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=zO187T94; 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 12si14394219plb.335.2019.04.03.10.04.19; Wed, 03 Apr 2019 10:04:19 -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=zO187T94; 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 6DB187D3B2; Wed, 3 Apr 2019 17:04:17 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) by mail.openembedded.org (Postfix) with ESMTP id C2B617D38D for ; Wed, 3 Apr 2019 17:04:15 +0000 (UTC) Received: by mail-wm1-f53.google.com with SMTP id z11so8335211wmi.0 for ; Wed, 03 Apr 2019 10:04:17 -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=WxaVUJcN59sQf3Mr01WMCI1sLkmpUwi2QFcPyHTKyHg=; b=zO187T94c/oGFCZuJIx37M9PVreEpfnC5vm+nUHeOLJa48dTnNoVaUJJSF1DTp+hew Ky8DRBc3i9NTRjQcUq1sMZczcN7N4GrT+GXDEjvAV+47U+lM0aoX/qYfjfvMnAXlXDC/ /vRRDvY7xhHy5AQqRVrLR4h2nwqRyLIYfyCE05RoW9vFohMGoRqzRZ7+owXHcP315LsK zz3StjHUwvrneScXP5QCtXS+9EF0LGt2PejX8nL36x9AhKMYHBjI0CYDUpSi60Qz3Cno BrLHdfNQj5vJnMH+hWPTv3qSb+wrg++yjjCcY0mgucyuGc/ZlC2KtA0GOl7SjxvP4XOu S9jQ== 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=WxaVUJcN59sQf3Mr01WMCI1sLkmpUwi2QFcPyHTKyHg=; b=lej5DO6TrzIVIIUA1RLKa5DGmZFbmpgwSe5BS+Uwabsomns6DxdjTXcf8g/nDUvSkV 86Q0xfQacN1ciao8ZiH9q5mzb/mCoAya+0mDzRE5bW4jLK/Ls7VPQHDk5Dh7Bxt57kD2 Hljl3BX+xy0KxR/9lJ30hotJTg/S0jRQ7KfpEJwoqkopkd5jTzZLWMuScaIYDkSF2pYg cMhIIuHZfxe5AD5nT0UB8atLo4GwysC45vR95oyLmSxONwp7ix0ycF3oW/+AWOrd8CiD YUCcdaJ7Xnn8SrmoGkm6A/a39+9CkWlBSz6O1d8Ynv/fy3e2qtlSfTqg5owoZ33JM3HA YEAA== X-Gm-Message-State: APjAAAWT4JYVcNMGxAuaUSlkn2QjmjoM8ZCV+TkOTtu9GKxvGytJJmNd wvxCQ1CQC3vNvOxtAaGeIo4XKaVUwkc= X-Received: by 2002:a1c:6783:: with SMTP id b125mr781652wmc.41.1554311056297; Wed, 03 Apr 2019 10:04:16 -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.15 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Apr 2019 10:04:15 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Wed, 3 Apr 2019 18:04:04 +0100 Message-Id: <20190403170412.23568-1-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 Subject: [OE-core] [PATCH 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 | 22 ++++++++++++++++++++++ 1 file changed, 22 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..dc63a0beb4d --- /dev/null +++ b/meta/classes/xmlcatalog.bbclass @@ -0,0 +1,22 @@ +XMLCATALOGS ?= "" + +DEPENDS_append_class-native = " libxml2-native" +SYSROOT_PREPROCESS_FUNCS_append = " xmlcatalog_sstate_postinst" + +xmlcatalog_complete() { + ROOTCATALOG="${STAGING_ETCDIR_NATIVE}/xml/catalog" + if [ ! -f \$ROOTCATALOG ]; then + 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 Wed Apr 3 17:04:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 161699 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp567830jan; Wed, 3 Apr 2019 10:04:24 -0700 (PDT) X-Google-Smtp-Source: APXvYqxfzMVxMsk7V2uaUIyqPupdsHnH9hVwCt8q2z+sbTrVNbTZoyPIbYBSeE3qRDlSqIbdLE79 X-Received: by 2002:a63:5b0a:: with SMTP id p10mr778328pgb.282.1554311063965; Wed, 03 Apr 2019 10:04:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1554311063; cv=none; d=google.com; s=arc-20160816; b=T3gf9gjFcqdcGC+s63EsDR0JrRbLxReUuiBRwy0YYUcSU9waK9oP24jAMk322bTrPe DEqaWuYrp0FmtcoCkMvgVXMtw3CsE+/h8V8LAdt9T1n4N8RKKsQnDwRj+Z6icUdYO/FB YckAwM0D/OYQT4RhmCljEkbn+WdWtcyE3aVebH6XgJiaQvWHNHG6fTj3cdUZA5jpFNXc ak5crcp4R3WULMMA70Q6utMTqF0xlRV98QQJLMjmQr1kJ1oiZ+IGJotJQMemaqqs3RVZ 77Tzlce6qROp6L2v76uGKTtAcehd3SZXkanfbNNdBgy4h78fKRXkVqNYXpXOwpywB8vd LOlw== 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=iFw7kjQR6QeAYoqYMN7st8/7vYZ1NmGonAV2JFJ9vee2P20qQ5CDQZS0e9fYiU0Vi2 7pAn8PzMhmVLlUpxvICbOkEa/WSGpSD2dIZfuHRwpqFgAseUIOK3eb4+krj0pOQ1BDbI cEP9EGgo8pLbz18ej7nMXF3EQ7j4C+dyHIx5um+/QkF2GLtJHhPPRMoXSOrnYhZogf6Z wv9/iXZlfjA/9JB4N41Z10cawYSecnYW2fpi4JlAiQMWUlc3nDF/WmXvw+nPF6ZLdvOw KJpbu4qy8OfKj5UoJ4DG1C1GIsnKm+JiacYtUpPCKjKEM1U0oSlLt2CBnconbXPGjOyG V9fg== 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=qP+W1A+J; 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 v63si6264905pgd.590.2019.04.03.10.04.23; Wed, 03 Apr 2019 10:04:23 -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=qP+W1A+J; 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 95BC97D3BD; Wed, 3 Apr 2019 17:04:20 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) by mail.openembedded.org (Postfix) with ESMTP id 2F31F7D38D for ; Wed, 3 Apr 2019 17:04:17 +0000 (UTC) Received: by mail-wm1-f41.google.com with SMTP id h18so9251538wml.1 for ; Wed, 03 Apr 2019 10:04:18 -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=qP+W1A+Jeywo+p8W6k4lPcU/zqZnmIbfToGa+5waXHmHn1MnwrDknZQw0X7rlUklvM itONezsEi+RqHQwcXl5oaQGTXqTEHOR+X3F25H7NI2Kkejtw4DH2S6iLzVFGNu1GIG2C VVdO03p/U9fQyxtKMWZtx3wFaZBxAgOuqici5TV5L0p2AFwzC8RTlR+dY9+Hg8GH6MFk t7HrIJ+3QH5lPKfhEs402hnlPmn3XCVGVnvfTTmWNHL8ywakiXHGqokyWuGEhFjyUsvf 7jQefJqF4Bdm28SRfJGBt978Rfl2ZcvLcucHBizPADC/Pifz5eE0rmXPWcnFQKJ2x1fp Zbfg== 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=GDGJlx6m20vkb1j+TJ/ctszhGNCPNWql+VjvJV1ikSxCz7XvCf8ZK+y7p6Iow0hnxz UomAd2+ihjO3Q9v6GV5HdGoFMlxTbydhVbIBqHiHjv1V2XfV4txyV8i+DJYEg/t46Y/D lxXCAf7ERFTld8WFr/EGO1xxggosgFHwDHfZQhNPWVO+jmQEWEnITEDvTI9Lq8Y/v1+7 F1J0eS2E0COqg/FRNH+Pxf7wcYrTCOLGKc1AdXUzK+4TmHkYbo+fiiqn7JFSFJvG9i37 6ssaXWQM1VAmbXbAraAa3n+aoEorN/0F/9VdlZBErORzOL/mrLswWbrvCzo+xRgncHf0 NCAA== X-Gm-Message-State: APjAAAWd/rFGq5cAiqQ3JpKE2plMkwToQWvZoDy/GQOLDnLMnTJXvENS 9Ic01E9RT71wMAC23p/xBRrwn8FgpBI= X-Received: by 2002:a1c:f205:: with SMTP id s5mr735856wmc.124.1554311057544; Wed, 03 Apr 2019 10:04:17 -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.16 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Apr 2019 10:04:16 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Wed, 3 Apr 2019 18:04:05 +0100 Message-Id: <20190403170412.23568-2-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 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 Wed Apr 3 17:04:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 161700 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp567942jan; Wed, 3 Apr 2019 10:04:30 -0700 (PDT) X-Google-Smtp-Source: APXvYqzZWhydXGdfG13kBKItEzO6wVg8B66JtygffOvFV3q/0bTby1y9FbbcXndmsBMTWrL4dPc9 X-Received: by 2002:a63:c118:: with SMTP id w24mr708554pgf.67.1554311069916; Wed, 03 Apr 2019 10:04:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1554311069; cv=none; d=google.com; s=arc-20160816; b=mn0eOC2lPVwWEPybhAD9wUlzrryTRCYy0gMvwmQxodSqTnDZ6rw/QLGaF6mjQ9S0xc Hik7TteqKlIkGXrC+Sun5oHjXVKgxTeJhlNSbbdJ98QG+yUhFwWssX0/eiE0vZM7Yoe8 oqWO07O168WXi6twCLrbMXLaoFKKFRrfYGWuHdIzvoW5UOmdBIJkyg5a8ocQ8wEONBBw 0lG9XhtBcntxN/Vtu9I2PU9MROV6lzE9t/xE5yVDoBuIsPRqq/T2Fyk4WxQU+4yqxRV1 DcCaxsXX8XZlY294+RdhA22R7P7xJobTNRG8avNyJ97+P5i4qHfcStvdIegVjx/8IPwU zCzQ== 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=cKoqs08et/ZkdSIJsmet44qq4GnHRHvqZ/N2imf2w04e7c+sfzCJQBYq2o7tq+pp03 SAT03GYzMYu6MZCkUfvHLSvvatq0tAVT7qzXgJW49xaHxa4iKBYZ+dLuomEotOLKlPPF R/Tyo8uC1o13pyfuEY8bTH1yJaEY5WjNS6+xoTpbDzbkTQ8/3gI5hGAbREsllytGkUjo cVnddH8Qi6FCnSp4bL2LkwT8JYkVOUM3/Vzbmq/pyFkkYn7egEkEBNFYCXdQkiPBhikw N5TQqKu80Sd7MDi8Sp9xeD6VzhOfTNHVqbu8pQg/htKysVB+bLq66r+7fIXCHDHLzY+0 W/WQ== 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=lxAh2sYl; 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 q185si14367676pga.135.2019.04.03.10.04.29; Wed, 03 Apr 2019 10:04:29 -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=lxAh2sYl; 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 C83387D3C5; Wed, 3 Apr 2019 17:04:21 +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 29F947D3B4 for ; Wed, 3 Apr 2019 17:04:18 +0000 (UTC) Received: by mail-wr1-f52.google.com with SMTP id w10so22400168wrm.4 for ; Wed, 03 Apr 2019 10:04:19 -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=lxAh2sYlddrShh9c1ZVxca4Uz++MZd7gwop8DDUSnjFCfH9WFIh0QVe+0/WvAbSoy1 8R+J7xEsMBCrDtmCeaDQRTkipwhdk+6dHQKZ7+BLVtS97KhwBglI/4cpcFgWV5vcsjjG SfYeu+MgDbEpLAIf8NStPM8mgQ8WTOwpCS5VArPlKBu4j/pwPR3tXUkRStE9LPgJSDKk kTQ04iQspcNTY7wufZEHSfNDwYT4q8xysENhynuJuxdfXIf/LNLvvYA4UGCKUNx6BbdX 4mTkUU+FInqdw9ZXaje0420f4ewfDm/vCS4wNbkzpMRBbdCDyS5xD8SVseDmfIhQfTsj ud5Q== 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=BQRBIvWJOKW2i8KlNMxCKJ3vUdWz0QY10BmGQpx3LyUdwWNPgqMgy/KRW2iLmOEymy V+sL9oANrWkjY0ZkHJ8G1Bct/pfqP6IWmXFPkCJA9WWK4mzHJfcxhgcKVUp78eNyK736 EDjtrZIjWVT9QMGPMFWMsSlwQtfh+WULYtrf616KrC/sUdwEVDam5JcfPK+dIJNAZZ97 Wi0YasgoKA14Q4O5He2NDp1rtRh+DbsVAq6rKtRdtSHQWAunb8BCQopLfaDKyw/IbDX5 EX4PZuW0Pz8OUMFT1SUhN8/Dm6Zy9tP3MRQt2bQqQ/XuvZCXkwa2kN0/zvLJ4v81O0Uq E8/Q== X-Gm-Message-State: APjAAAXuuSGwzWzBDkhEMS7bfoJL61CbFmd9OW3MycJLzcPyp9A0dyh5 ZthdTWud6wnWri/IJqv4FvrWB4lO/qY= X-Received: by 2002:a5d:6883:: with SMTP id h3mr447474wru.215.1554311058964; Wed, 03 Apr 2019 10:04:18 -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.17 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Apr 2019 10:04:18 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Wed, 3 Apr 2019 18:04:06 +0100 Message-Id: <20190403170412.23568-3-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 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 Wed Apr 3 17:04:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 161701 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp568055jan; Wed, 3 Apr 2019 10:04:35 -0700 (PDT) X-Google-Smtp-Source: APXvYqzYU/SwdU62PneCuFai66QV1IFW+KhxyLV+Jdi4HA4ZMGB63iZukj/7qz1YQD5h5Vs7DZ2d X-Received: by 2002:a63:c10b:: with SMTP id w11mr737689pgf.39.1554311075583; Wed, 03 Apr 2019 10:04:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1554311075; cv=none; d=google.com; s=arc-20160816; b=mVDEGlsr8iJugrGRm7+zzyF+UDHgb5UC6qDgmw+fpdfzWHXh+kSa9lu4EDQQeL5eNL sy23iBoLlNHBzbkus11NZ7mQMI9L3geT2ZM2b/RtKLL/gm2G/rsj68m+PU08CPmWrnpr qxuOjXDtxeK8bjJOHI+v0/qGr7FCsqYj1xFaLNwiVBlUIV7bVCTZV+wUNUGBqdPDfDsq UCqIvHh+iF0rgzsBu+UfwUB6xS4vGyApA6ZRh+O9u1QKFgiGUtqidbGGw9yf1C0e228G 8fYh+PSWI1mqSFv/2g/KO+JB6JUogUyhKzhVasZbJroloAf+ixoYbAmHlXae1Jnt3UCv nUxw== 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=xtUnivPB7DJQhS/6oBArDFjpKs1tzswsgqYvatOr6AIJTMzH4mLpEEidH5pG35lLhq PW7Fev9uvq1iu/NHGUB4VIk1nstNJqRojEvYW2ClkADNtIXLtdsu4Q/nHU4h4jsnnRkq dxrhUs6esJiY0GpDjaBH0st75OahnIfPfUDBtKyQ+xozD0AHjEV9ywHXK7g8nBQv11BE v0qP71+TSPIvwn2a1T88KTRZ8jkkTMPpTT5EVMFGpIDLPvCLv7w1DOWRbR8t7P/fvC5f r/ouwqGN7Y/ZxOIixesvYsUx6dCp025Uw3MLpBfuZ12UcE3ulzZw7+p7qI/o0306c09k oq9g== 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=X0t0sj2N; 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 b4si14242183pfj.16.2019.04.03.10.04.35; Wed, 03 Apr 2019 10:04:35 -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=X0t0sj2N; 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 EA6A77D3C3; Wed, 3 Apr 2019 17:04:22 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) by mail.openembedded.org (Postfix) with ESMTP id 786357D3B9 for ; Wed, 3 Apr 2019 17:04:19 +0000 (UTC) Received: by mail-wm1-f46.google.com with SMTP id z11so8335501wmi.0 for ; Wed, 03 Apr 2019 10:04:20 -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=X0t0sj2N5bbb5eVBLRzX94WHiHKs8UYWO7A4G5emVf02S9N32AFSJBDDoPl4XK5P5Z eA2ZmNmJXBZozRp47BzYbrvrRw4FIc7sSBwy/Wvpahj5hqGc2SVUTAXm7a5HCrNCt5dW WcCHQTdXXJ9D8PMOBFeIQEEy9SgbsoxPAt8weVMwC1BIkSh6/+jmipX1pd5p1exDpjp1 A1g6jkbuCVpwOA0MVTIVfd8jI/QjkcBpxPJevpuTUWWpINTkG99KtpCxMjILbBE1MHHo JKv7HrShfM49xMNH074hykzXA08zyj5kjU2ZcrlK/S/STJdgK00Q+XJe9V/UQ+xOjTWV /YBw== 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=TRNbLT92oMXO7KfKPmtZ5Er5BCQDRCIJH8XgmZXbJL+jlFgMl1XZpxOv/lAIUDmhXe VdEmsdZu6b0iiPtc9cp5gtz2l1eSJbJemMu74Ugn6Q5JWymVudiePMgC60DujPP0F4lu X3ZbfTHEV8JLLsRTBjN2K7psXvrWKCLp8kRL2AT5OxTAW4OYMb75NOt9yWdVdqhNtjfz aObw4ce5UzBg37Fq682CQMulQ26Cki/Ro92um4MiyDp+XUaai8QUb/T+poDoyqunNQ8k ZL/jQ9k9pGOQfgzdduBLSrClfiWZdmM8NOPma44WiLKIepzbik8rX3x1nbCaA8G5tldr jO4g== X-Gm-Message-State: APjAAAWJEetkqKuCc8LPQhq28KEJNjBI/hsPTNVwdgmJx8SFNivrUJqD /w0UlbQRbe1ldbcaFzA6SGZjcgl6IvU= X-Received: by 2002:a1c:c101:: with SMTP id r1mr711468wmf.123.1554311059965; Wed, 03 Apr 2019 10:04:19 -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.19 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Apr 2019 10:04:19 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Wed, 3 Apr 2019 18:04:07 +0100 Message-Id: <20190403170412.23568-4-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 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 Wed Apr 3 17:04:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 161702 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp568201jan; Wed, 3 Apr 2019 10:04:42 -0700 (PDT) X-Google-Smtp-Source: APXvYqzjHHTM+lh54sZXBIvfPIWOubqzEmQG6zUW1Dqr9oPvhrSA8tEF/1nyswy6DXjO9eUXlkRe X-Received: by 2002:a63:465b:: with SMTP id v27mr745017pgk.165.1554311081976; Wed, 03 Apr 2019 10:04:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1554311081; cv=none; d=google.com; s=arc-20160816; b=mJ5AjmlLPKrqP7i/Eiuijiq/gPHRoPWRyv/DBdT9LkZ4Zn75ItKLazb4CAS/vkl7SP kUZqrB8mCnx2IzA0n9xLy73/0j5PO2DfZybWtiXfBb2PxELPdbcRA5gLKj6P+qb/hvIG KqFRyO6h5XGHvLR5ricI8IkCUuF8sqvDY1ZBk5W2oD9I2Sdbgq+1Oliv2Yf0n3MYrD8j i5h/aWoAmd1dVRvHyHiAiK9Okh+Cg/tg41Xt/cM78sCbqL5lnDCfE9QcPSql8W6h8LhT exJ4NHt1lusC/Y2EEdLP+d9gIW2Iz8m6iUKoOWK+LN7QJ/9lTCr1hVSXMojhVUVaZTgq G3ig== 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=FFBDG90iBZuggi40m+8VzXzYRjA/gymabkkBN9EWAwnSAPvHeH2ZQAEURbDDM1t60b RJXgOHwJM//YrgP1rnWGhYs/QdG2A+GRs3UhCZRpfzXSSJQFy9fMbkeB3Uiox4ifSZS+ B7wu7UhDQTaYHTwXs9J5Y/iUTaHwP9r1lwCcZZzTMk+s5geYJeQQpNcN4RRyUizPflbm f3RAWMuBbJp9KffLoSL1XnQXXWIjAYVv5y4OzXt/exZMWZArTpCjNwhQGL9TK6SP73b9 Gjkje6UlooXRo1AZNBRzQ63DQW+a3r8d0syggS6h8gQmGMHvmfR9AJlLzW5b4MWRYaMO K6ow== 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=SQohyI+5; 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 d1si14874953pla.243.2019.04.03.10.04.41; Wed, 03 Apr 2019 10:04:41 -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=SQohyI+5; 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 26A8C7D3D6; Wed, 3 Apr 2019 17:04:24 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) by mail.openembedded.org (Postfix) with ESMTP id 611657D3B1 for ; Wed, 3 Apr 2019 17:04:20 +0000 (UTC) Received: by mail-wm1-f44.google.com with SMTP id n25so9203924wmk.4 for ; Wed, 03 Apr 2019 10:04:21 -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=SQohyI+515m8el6/nFkmQhCvILHVRk/r8jQsSIUBrLLgy6bRD1Q18sptmwMzBfuA/q mzKNi02EzPiVkLJ2Lb8sJJyzQgwKcQEQwxffFtETGllNJkrd6xtzU4dJMMViSFmHnswO II5ZlknlX3Ygs2R7UlMVCJfU8eLDO9O418u6Wuo6NzHT/gQ5NeVp/mQGH2U3q9ePik1v lijklOaHhO4QIKvVFxyFHPYQASeHL3C14kfd14ZGK6N+zyAZD7USCed2mQdsLTpine5d kTwgeCgP2ShWgsoZ49EELLvna5RakCU92cL01lsGmAnzEhRfMg6Qpw9eJ8bvgOXK5+Tl /lxQ== 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=f7I5V68D4dGoBiGmRKU9+2HfxWOZFqBkhlke8GRMOx9DsBPYiuoJgKsh+EjhSqeC6X BoOhqqoLbuRw0usF6TDGMmMXihPHrbZDU8N4KmD5NRr5VtT3JFGfx5xYVvobUSHRoCec lhZ01tmh/757A20rZcQ1n+6UzLCyVjZrLxtwRTEwQU7IEChM/I8Te2Pvpn65v+HKLC29 kPZZH82pZEIRUqBNMtFrdR4KIjZiY9C9Iq7VloHIsTDVZy8K3CL83M7LNjbr6zKVAXWx aAcONFZ5b7XrwDR1YQ5ZBKhszwBSZIb+JHId1hgFPoIx6g5MEJsnkLgyRR4ap0/Pr9u+ JqFw== X-Gm-Message-State: APjAAAXe6zC2FYV2nWOBG9YtoOwPaG3g+JiKHrzNHl4Kb+yZ2avkOIwG 8PQ0A9IHe+5kbCmOyGT6iCHpivnF8do= X-Received: by 2002:a1c:31c3:: with SMTP id x186mr707979wmx.82.1554311060917; Wed, 03 Apr 2019 10:04:20 -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:20 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Wed, 3 Apr 2019 18:04:08 +0100 Message-Id: <20190403170412.23568-5-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 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 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 From patchwork Wed Apr 3 17:04:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 161704 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp568464jan; Wed, 3 Apr 2019 10:04:54 -0700 (PDT) X-Google-Smtp-Source: APXvYqytsZDVejhuKPP5o+BSo4bj87iKqGtijegk4F9HRtv9dy+iwhBPAszGP9ua4BO1ZgmAXC+O X-Received: by 2002:a63:d709:: with SMTP id d9mr771404pgg.38.1554311094295; Wed, 03 Apr 2019 10:04:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1554311094; cv=none; d=google.com; s=arc-20160816; b=x9p4CBkHxQuD5xM2w+fmy8mZ3yqzQNRHxTEgMzYhm0FxtO+hyAKmoPpsnLKQNF57qu Up7tThQQ7XU5vLwk04bOoQDktOtQgN6eXYoApSrDU/em1Em3n8PG5j4YbSyYb2jzn8VQ rWiChHg9aaIpcz0TalDy3DrYiurWMUQZyF5Ojflojz1bhvG8GwmcxlN4Ww0IgcS3Ygta KpYv5a/3uFAVXrNHNQPUx/pUAlWc22BLe+br8b0Kvszx1FSKYtVfShOs6c7YbEXuv+EP bbht/87wVb/UIGAJOARlAgxj/lHkkeKq6M/HEKRDzXv5cUD17M/dpFWnQwuZ7zLwv1df s4KQ== 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=I3meyktumsVT+WgD5VRETebI3eOwG4S94SUj3WK23hXbvlMjLTrRMY3JycsXzzxRKc mXJpTI8X57mk48E2HnevoHs4A9TFDrzsYhm5Jw21nQuTyMJqrVUJ2lSViD4eyesINHKa +3FoFdlgpgDLoHV6Y20ubiZ4M/UxR4+O4MkW+w8vUgeaTAMNmKOqV+QfQTBEh/e0mQMF 1L6KfBcZqyvt+3nNyIA5P1AeSu2au2CXoCz3DLqUER1yRv3NqRH1ViEiLki3KFIVgnCw faZqe6LUvdVQNgPiZUGU+BBYQmokA6a04cP4kpCU7yZZ6lSJgjtEplHcf6SHTYlbc1lp /5Zw== 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=WYggJtXB; 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 k33si14731222pld.27.2019.04.03.10.04.54; Wed, 03 Apr 2019 10:04:54 -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=WYggJtXB; 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 75E5C7D3DF; Wed, 3 Apr 2019 17:04:26 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) by mail.openembedded.org (Postfix) with ESMTP id 86A2F7D3C3 for ; Wed, 3 Apr 2019 17:04:22 +0000 (UTC) Received: by mail-wm1-f54.google.com with SMTP id o25so8230110wmf.5 for ; Wed, 03 Apr 2019 10:04:23 -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=WYggJtXBy7Av2TcKRKo3VQSUbCxG9X/TNjNbz74eIwYynI9oh7msWYlVjJW/kFp/Wt PCGLOe3sHV3aMkKtTnEL3Bn8c0wfYCI7dat29RHdzt2Ui3mArqMJFgV9jDQweeHVP+RR Mwe2PzICtgha0lpG1rksaXF52jX5nhVeJawE0Y1GMHCMm5hvH45hjMxFhqKAhlYnXZsS CvIDJbDFnYU0zS77+R9O87psIFMqATl9yUThusZ/pauC3ehXWYQ3o2YrK/Ni5LZG/2Cm IUNDXl/Kr9Zo33JgW+gCGbpNFpjVkD0xn8WXh+GQDQEYX/rMT92lehNsgQdmKsKtt+l/ IqLg== 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=BWoToX2/767OkDSuXzUxf779v+ErI1w3uPtRDXv5NHNn6Te2huNUnq2ROcJMi/it1W Wk+dU7pKE80dRtxk/PVFpfURzeRDLTbK5j04q14EpldJ+KbLPBgI83ESblHzMBj+Te4g Tc85p1tGvY0JDsH0AJGxlFxLy2msB1akWSTG5eD5gLFBJVXyqPWtACpYKc/rasaTu0D9 4O1DHAy3D9jP8jiDNnZy7YVAM/66RkfMLAW8BKqcNkhpV8GlQhkXwnp/wyM2JwJ2PNDk bm7c7l03EChoCVRHxckBw2KVIROPoqSca7hJQfeWKxRCr/R3+w3DFXU9CbPfjfzJSfk3 YhpQ== X-Gm-Message-State: APjAAAVYrYerXjTKos7Xn8nnkitV9tDEOsR1FaKSzc+9Z4Imh6mkpTHy 2/J0Cm9vBnJj1Br4KJquwQVPbslFkZg= X-Received: by 2002:a1c:1a4d:: with SMTP id a74mr825934wma.50.1554311062978; Wed, 03 Apr 2019 10:04:22 -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.22 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Apr 2019 10:04:22 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Wed, 3 Apr 2019 18:04:10 +0100 Message-Id: <20190403170412.23568-7-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 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 Wed Apr 3 17:04:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 161705 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp568571jan; Wed, 3 Apr 2019 10:05:00 -0700 (PDT) X-Google-Smtp-Source: APXvYqyqpJ1hIOC0BH8vAw1jBbbgYZeXE6i8HZXl32yg5w1CULVdR9fX9GV1KKV9TjXYAkjj5Ocm X-Received: by 2002:aa7:818a:: with SMTP id g10mr514227pfi.178.1554311100156; Wed, 03 Apr 2019 10:05:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1554311100; cv=none; d=google.com; s=arc-20160816; b=DwxYxvoYV4iPFE8H1uvONDL0WXkFNBnYVNq9uZixQjmxb26VqmRt6/QdEGWg6JWPSR iO5D/DRrMXbxCtNRatW1dk9xZoKTBMIyf+zM2V11A9jFm8zI3OzGRKSCM3wfF7EXwCc+ yVt/k2e5lx41LqS1btmFt9tu1OVPRbj64W9YIEN8IxrN76B3D4+xUU3NhxaoD2PhY34V UNdvPidZlZGc4XylIbTI3GerUOs9KbdlQ43kw6cthSyV42L19zs7xtZde2BjuwOnfZ1q EZ1ImBqTgN55TBmoPF8dbJl7tzO0MjGCnG8HoFFRApDpSCFca/IhBEvX3lj+rvwep7b4 IAyg== 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=ehigpoYN4cxCx4hlxYZHUN8cxUrn8kU4ipfEUwT0opA=; b=zX3URZAxIRBjmqt2EVshvIfhdlBXFobZcehv7V29haBR0PrdMM99VklFdMyUwqmfTT YX+KXM1OBijH8aZsxR3l3XYs3R/GkeTX7JU00YCGzimjNJwFxLJK+CT2g6KWWOgIWGhB gn3AxqGOSdsksgcYR8xciMeCpCUd0yyiWKiPg3LvQ8o7BIs9GCvIX2XKrIU+FvsK827+ PLtw871dRFbGB+/9kZPSVeAUVNPeyBEasSbUhgVEhwXnWnuCxdvAudA57Agu0swTXy5d jB1DXgjSZAvHu3ee/r3PaS/meK4EDYZuFMM00qY0Z034OhxX5EnLsI4n75EZziRon3rP 3gMQ== 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=KYHXTnpS; 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 p3si13879049plr.45.2019.04.03.10.04.59; Wed, 03 Apr 2019 10:05:00 -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=KYHXTnpS; 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 9DD6B7D3E6; Wed, 3 Apr 2019 17:04:27 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) by mail.openembedded.org (Postfix) with ESMTP id BCDA07D3CE for ; Wed, 3 Apr 2019 17:04:23 +0000 (UTC) Received: by mail-wr1-f44.google.com with SMTP id k11so22432015wro.5 for ; Wed, 03 Apr 2019 10:04:25 -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=hzk/tjZzMRWxORB0IPs3e8O4nBV0dNJE4eN2RNOKBCI=; b=KYHXTnpSStRLHEdAJbcxcEVGpVIv4kikOEzpJ70tVQ6ErNz8h09hVsYldSv6QhGmi/ EqqRZan5EUtX7qhIIlpLyzdd+NRKBWJ4ClKkpEKYFl6SCeP8MMQjMPYyxOYc0NJtGNpt DJhMaMAwoYM6YNrKYoVJSWAbHZfCYc7dH9bSHApkZEN9nzFcPbv7mI6e7YPZsY5Kmjdg XhZa0WtxiEh4Ecg7rLvf9HNV3QuRYCkCRkiH6hoOaL7CwSUysMkDOw1jHJs2xufx2l8k 8VOLuXyetuJs2EeloUSuieSzECv4F9cK3PIFZycSJ+KMFIJfh7LNEyKSgC6E+sALfwK9 tcIw== 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=hzk/tjZzMRWxORB0IPs3e8O4nBV0dNJE4eN2RNOKBCI=; b=nZTW1fNJyGabgTLLz2UPAJ03Pa67TlmGIlGx0rQLOp6jTI+Fwsb0QqkqGiIgjCeFJm c2Dh+ialBUBlKt8JhZGO8dpLsvqh8elPJ4TIJSk9ExfwS5+wcH/8x70hiou75kQI8iyp RdISaxdqFXPkoBzdYMl+5+AHlu1qzxMkxwWmvnQq6zLe7pcFKmiPJq5qLvyno62vauIf xHmAiCkNGKhKaytc9oSAwVjG5+TG9bCmN83yiLYGRPI4ErarfxjbjjH6ZQlewDn/4uiR cRkqJJ4ltq0JJtDvKQTwee0dQp3yvBYuWEeEoC62E4dSlnaGuMxRbpakpCDAov768XOq NnUQ== X-Gm-Message-State: APjAAAVVrpFdMp9nvebY4yfb69NavIeYfk4ru5d3QP9Ni02MI/b30tpu 4rrLmQdWwIdWfqyHUoZ+GfMzpSpy6xs= X-Received: by 2002:a5d:4d42:: with SMTP id a2mr496902wru.130.1554311064292; Wed, 03 Apr 2019 10:04:24 -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.23 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Apr 2019 10:04:23 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Wed, 3 Apr 2019 18:04:11 +0100 Message-Id: <20190403170412.23568-8-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 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. Signed-off-by: Ross Burton --- meta/recipes-devtools/xmlto/xmlto_0.0.28.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-devtools/xmlto/xmlto_0.0.28.bb b/meta/recipes-devtools/xmlto/xmlto_0.0.28.bb index 06dc002083d..b17c11f5464 100644 --- a/meta/recipes-devtools/xmlto/xmlto_0.0.28.bb +++ b/meta/recipes-devtools/xmlto/xmlto_0.0.28.bb @@ -12,16 +12,16 @@ SRC_URI[md5sum] = "a1fefad9d83499a15576768f60f847c6" SRC_URI[sha256sum] = "2f986b7c9a0e9ac6728147668e776d405465284e13c74d4146c9cbc51fd8aad3" inherit autotools -RDEPENDS_class-native = "libxslt-native" -# xmlto needs getopt/xmllint/xsltproc/bash/tail at runtime 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 Wed Apr 3 17:04: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: 161706 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp568718jan; Wed, 3 Apr 2019 10:05:06 -0700 (PDT) X-Google-Smtp-Source: APXvYqyGqhnek9fxtNz2ZkqAT6Xw62IwK4Q6iI5O6/a7Zd9wMmTYouOBciWlFROgqIZ3cC6dIMXY X-Received: by 2002:a63:e850:: with SMTP id a16mr690695pgk.195.1554311106459; Wed, 03 Apr 2019 10:05:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1554311106; cv=none; d=google.com; s=arc-20160816; b=C3MTIGURziaS5njCmpCxxqIp9wCr+BfOj0NXeGnuqUGc8J3F8nWfZIF7Ec/Pj0INTm b53DtSk1tpwGtqKQe3Oiss2g5gAITbVV+QBgDKjJx62W2l4pd+iunY2UkSF1kTfjiPJl 6L/KeBJ4ugXhK/BCyF/69SszXDPsueLgzJbzCgVynHJHqKxtWnH24QQvsWw+q1+IhO97 K+1JyS2A3iMEy7/dBzo+SHIpUl8JY+yZNSTrQyoC22MmD2uJMVy6yfUhmNa5SH/4oNC7 l5/Jm/7zbGbINtMxpuHB/ztwo6ZShiOhHDHntBJ5RLXqEBugHmqzLdGZazWPJaUk7qsx 8mjg== 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=tQFL8bDd8/MChhcX52VU8wMibN7zKAWoEq2iJTMI1fSBKOR4A6dsOGV88gFmIEgOcN LL5WYujUOwe4PeP9ajzAxz3IUSjsLhkdfuhqlGzuF8Y/xPG5CVutn+GXMx0yHYj1lywj W9Q4+rsq69eafxW3zLDR21oxLKXdnfUEBU9DhVv4tgq6IbNmU2ZoqrEQXROxCuB2Bsei fP8hnXSpOnGzAsCHzMyiKnRkkC4uNtx33ZKjEQbHAHLTg0VT4i2NdVeaITFE2OC+tLac rBFPJUCO91/7z6pqe8PiN6QXq/XhHVZ+ahdhIK9UAoSmI1zOkpS0t+5CwZICscuLlvy7 lHZA== 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=wFUSOcxt; 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 p17si14015139plo.223.2019.04.03.10.05.06; Wed, 03 Apr 2019 10:05:06 -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=wFUSOcxt; 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 BF5CC7D3E2; Wed, 3 Apr 2019 17:04:28 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) by mail.openembedded.org (Postfix) with ESMTP id AB2E77D3D8 for ; Wed, 3 Apr 2019 17:04:24 +0000 (UTC) Received: by mail-wm1-f53.google.com with SMTP id v14so9218230wmf.2 for ; Wed, 03 Apr 2019 10:04:26 -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=wFUSOcxtd8cFuTbLc8nUi3L143S4tkTTsS6Zl0AOzLpMBKm/chrD+4I1MPj/CaGiLA 3998Q750jWU6X7+r1KBsmqgzaw386VuH0b++xhC6N8JcA5XlFPFYCeW6AHy+beuJFAgk WI6V9CIPV4bMSK7c8j7wgE5Sy9G2ArjRJM+OIYI0aMCW3fMJKPtRWacFqp8D7ZBfmvfm V23cUctemfRhSIOty6Yx2SiLzt47WcScD9tov9doMASWRR++VrBcqeuM0NJ8rWzTgFne jYCycLQwqo2/BhsccQAoFxsiwbolLviv8btv3WkRXBypfjz+ZjaRrqiFhCM2S1mfthRh iRWg== 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=VIa2Lm+QPYDesSsw1mcF6/KZ7uayJ4zH3X4Lqg9FrWyX+gkQBn+pgi9ALOzaPdBrKh VnC/mVPyXJ9Y84dmd0auECJVVBKTbJGcd9yxXPgmHYvOB59ycZXAFTiusTZEyvInSKdd Im/IIGX1kNAfJDTtkur93eTblaO3nmPS+WAtteLSnSVkqyg1x/s2RNTmd5yNXBrWrGbu eJIbwas+9UV96f5L8UMGvMtGNY1tYNRku73rufBV/wWUz09j4ic+7DsuDTmuV5ciLrvX Fht+YZHavS5SOMltZOu5DHKx1MWZaYlF6XFx+hQmNQhY9BJpAz51Gu/QCyAb/r4MzBtm 8HMQ== X-Gm-Message-State: APjAAAVwZnKz/CaGW2XHrP/P9Ki2TowuwVy+UrJnGiBhlgKySC5Qo/qn GjbWO/ff68RT5F39f1CBVvkjahekXLs= X-Received: by 2002:a1c:9dc8:: with SMTP id g191mr739726wme.132.1554311065257; Wed, 03 Apr 2019 10:04:25 -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.24 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Apr 2019 10:04:24 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Wed, 3 Apr 2019 18:04:12 +0100 Message-Id: <20190403170412.23568-9-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 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