From patchwork Wed Mar 27 14:20: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: 161259 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp6544429jan; Wed, 27 Mar 2019 07:20:11 -0700 (PDT) X-Google-Smtp-Source: APXvYqzC/JsrapnB+NZiac4hhJuSQQ6Cxjk8cThv3J4DQWytBaJZ3ei1zI+6t2l9G1TZuypI9V2c X-Received: by 2002:a63:ef09:: with SMTP id u9mr11348911pgh.126.1553696411868; Wed, 27 Mar 2019 07:20:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553696411; cv=none; d=google.com; s=arc-20160816; b=Hc6H9kpfq2mTKpDLwbo3x05JRZF/qW8x4xQjBrjcs0UN3D+rmYiZ1RjqxIyTZyXvJt 7+/S8qRGndVmBuYovw9JvTucTn2YOasEjrvkTy1VBuPIZCxyT+GMBpC5SNJm1J0bBiwB tfvyxhKUEB09ZBUYRw4yrtMnJdPbSG8Gku8DGs242wUomb56yQL8+h0f/rnq5+gbdCgi mo4vyjRkNvLjJJX+NMYztzHOBPYvocS7KD4X/0jHxGIUEpC4ENlBthgTV28OpaBn4MFH YKBka2CnJeL0bxS6AvzRkKPXvaspcrVRaTEQfwVgPt3YZHPjw4oNPTjC/TcXzCB0MffJ pG3Q== 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=eSAdxJkZjN605ZaTRLqNB7Zzkwrdt6HWbKll+eRQfgg=; b=Rc1YzrufpQakNceQLdW+ViJDnIH8ZAmIb0sBf2WuKB/JGLe+0J6bkuiO+efvgR/iOK Qx9rekoCi9uRHfvcUUUD7HG3pSgHEv4T+Y7knYSa6ITGetHtRDn5e3HgdDdn2OFsHf3a eCdnqQWQaPwJwFZDUClhhaDOBnapHBuAxrUNHMFbv+Qa4jZpWZZQM0JVsCr2BHpbj3tY +8k8PDAWpdLumiTNoeUvSUmv9DL5bmQhwOPUwnDkLTSzlL8VHikgfnK3AN08DHIg4cyX WVEP0lup72KzK0wewKmsal9988ImjyYjEW8pz3Xl29LqKEK17JoE/zO8M8rgHoje5gzc ujhw== 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=F4plxVE8; 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 w10si18912347plq.328.2019.03.27.07.20.11; Wed, 27 Mar 2019 07:20:11 -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=F4plxVE8; 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 DB2CF7D12D; Wed, 27 Mar 2019 14:20:08 +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 704D37CDF2 for ; Wed, 27 Mar 2019 14:20:07 +0000 (UTC) Received: by mail-wm1-f50.google.com with SMTP id h18so272383wml.1 for ; Wed, 27 Mar 2019 07:20:08 -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=/2oV7x80mIThXwDcqcpI8unBuSXfo/ktQfsSwItDyeE=; b=F4plxVE8twLUasb3lGykV9Q/c843fBvTF4QPmoNzS9BLcFU1NnptmjaPpnfUkVRKC1 gZ9uE2AtrsPWLdm+xdovQI6ywaT9MxBFN/sIbJQJ70aDGDp/rMyHxfWIBvrtmIjofWr0 QiDpopQT4i11IeLRlwMp/IoQwbOI5UnfrJMvFe3tkIbx8ial7Bqbogm9CWd2Z3J90uRj W8Z55/lvfCZfryWSkqeSGd1oCCCcagxuL0bEwN+QaLD2KGTmYmFRgutee1C4Ktl9cipS mDpZfVMGpw1XYxRqUbuF8zGeajeXq9QbgJYaFFAgZT+tRxddYedPN60k3TXrElOfFf+j TqTQ== 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=/2oV7x80mIThXwDcqcpI8unBuSXfo/ktQfsSwItDyeE=; b=oHbhUbxTvaMs2y7kds57wTcead5RIXnUgic3VM1VmZ00mF9zLdFaoZ+3x+D6RMHKtl CTB9pkqP/iQIy1Oy/OK+PQkkvr3O791fIdMH40o30KyxdK4CQoLvyPYtGiUPR1WhjJxX OeVrzP4gMwkmnDd3JXBO+yL4IuRJMV0axOHLZ3ehPzxcFP4os2XqthWnlNy5+Uz+LBtK yMhQ7/K3jckGOHPV2/uFsWYb5Tjl7yeJaYTNNPK2ThKAQ3Q9VW/ayryApHG3iz867hHD JiLqzn++AU8qntTbS5ZiidUtEdUExRs+RrMjb3vc+ftscHFZmZ75Yw0Op5h2aV4oG1Kq SWLg== X-Gm-Message-State: APjAAAUu52vZBobNPwoW55UsSC8NulR0YKLMgLWuEJyF/XyIeSsfYQCb 0CAM5FIQ7ZgFGRrE2YbJiKKCcLV9Qi4= X-Received: by 2002:a1c:a004:: with SMTP id j4mr17882332wme.143.1553696407932; Wed, 27 Mar 2019 07:20:07 -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 h84sm225758wmf.15.2019.03.27.07.20.06 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Mar 2019 07:20:06 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Wed, 27 Mar 2019 14:20:05 +0000 Message-Id: <20190327142005.17453-1-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 Subject: [OE-core] [PATCH] asciidoc: use Python 3 port 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's a sort-of-official port of asciidoc to Python 3. Whilst the official replacement is asciidoctor which is rewritten in Ruby, this is a fairly trivial swap and removes Python 2 from core-image-sato builds entirely. Moving forward we should evaluate asciidoctor, but that can wait. Change the RDEPENDS so that python3 is only a dependency for target and nativesdk builds, for native this can use the host python3. Remove redundant DESTDIR export that isn't needed. Signed-off-by: Ross Burton --- meta/recipes-extended/asciidoc/asciidoc_8.6.9.bb | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 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-extended/asciidoc/asciidoc_8.6.9.bb b/meta/recipes-extended/asciidoc/asciidoc_8.6.9.bb index 38164d55735..d0d15171ac4 100644 --- a/meta/recipes-extended/asciidoc/asciidoc_8.6.9.bb +++ b/meta/recipes-extended/asciidoc/asciidoc_8.6.9.bb @@ -8,17 +8,20 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b \ file://COPYRIGHT;md5=029ad5428ba5efa20176b396222d4069" -SRC_URI = "http://downloads.sourceforge.net/project/${BPN}/${BPN}/${PV}/${BP}.tar.gz" -SRC_URI[md5sum] = "c59018f105be8d022714b826b0be130a" -SRC_URI[sha256sum] = "78db9d0567c8ab6570a6eff7ffdf84eadd91f2dfc0a92a2d0105d323cab4e1f0" +SRC_URI = "git://github.com/asciidoc/asciidoc-py3;protocol=https" +SRCREV = "618f6e6f6b558ed1e5f2588cd60a5a6b4f881ca0" +PV .= "+py3-git${SRCPV}" -UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/asciidoc/files/" +DEPENDS = "libxml2-native libxslt-native docbook-xml-dtd4-native" +S = "${WORKDIR}/git" + +# Not using automake inherit autotools-brokensep +CLEANBROKEN = "1" -export DESTDIR = "${D}" -DEPENDS_class-native = "docbook-xml-dtd4-native" -RDEPENDS_${PN} += "python" -BBCLASSEXTEND = "native" +# target and nativesdk needs python3, but for native we can use the host. +RDEPENDS_${PN} += "python3" +RDEPENDS_remove_class-native = "python3" -CLEANBROKEN = "1" +BBCLASSEXTEND = "native nativesdk"