From patchwork Tue Nov 26 23:29:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 180236 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp5327832ilf; Tue, 26 Nov 2019 15:30:11 -0800 (PST) X-Google-Smtp-Source: APXvYqyoW11DdgC4X4a7MlJiPz0rywDP0MeNB0bb5VPe9225MCtTehYjWqrA3YihWHh6137q1kFs X-Received: by 2002:a17:902:126:: with SMTP id 35mr943450plb.105.1574811011742; Tue, 26 Nov 2019 15:30:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574811011; cv=none; d=google.com; s=arc-20160816; b=yzfYFZO93c4a4a9/wYsctUUBGbzlZXEVmD5Vjczb6Iacn2nEkY7iqTvYzDy/H0YbQo Wqd3LWRvm7FyH293Zg9ew0Ec4B0HqVNkefBf5tXG3G8dYdMuVkPb3RdVb8QH72AplbKy CFlcRS5uBjNijf7W1Q1iyvEqG1B9n2PWtAH3+FZAgFkPVxHblxExHWxkl7p/Odd7gJuM sqljfWuSItERjioY7+8lB8W6oF1a6saNjlvv+7kLngJ+xwTrwH1G1DCV/qB9BETRDOcD 6/h8vKm+PiBWkv+7yteh3wwgoQK6bMjF2UJ36eup1YxQEUFEZ6136ScLyJHpE7ZOOPWm dDUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:message-id:date:to:from:dkim-signature:delivered-to; bh=oDgv13d9TEIUjikXC7D8xVMEwP0M+vwNhILHmgGAOEY=; b=tF5BrJF/KVdSa6SXTiU7HZJ0S4CV3rTAdXjnhe1MaxRznLE00ix10OT0Ghj9aG7vzE MbxRP5RRcK8/Vm9NP1XRiBsD4JPdMgKiFm6hrsBeKGqtOIwJAkgvqWsNDnNWotePwTkp AOwOfFm+I7Y2M18tWaAM6j9ZOMh2xzS29RoW5nKaFbGrTeCI+5w19Kg/4cKm8/lLiFXO VsSNXa1K2MzSpxutGesFNTnbXr3Aq9RU9q8/TmvbZIgEwbSKeuI1sfw9hPEteADmAT09 HKCmQoIgwj/RBgATeMalLKpdR1thIGVNxkhLyny5bDvmcmMwyDavQAVFWiGdqW5pkcWs 669g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=OSZxh2v4; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id z8si12063835pln.203.2019.11.26.15.30.09; Tue, 26 Nov 2019 15:30:11 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-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=@gmail.com header.s=20161025 header.b=OSZxh2v4; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.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 C26397FAB1; Tue, 26 Nov 2019 23:30:04 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pf1-f174.google.com (mail-pf1-f174.google.com [209.85.210.174]) by mail.openembedded.org (Postfix) with ESMTP id 6E22E7FAAA for ; Tue, 26 Nov 2019 23:30:03 +0000 (UTC) Received: by mail-pf1-f174.google.com with SMTP id q13so9982812pff.2 for ; Tue, 26 Nov 2019 15:30:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=IgI8O8od0hH8X5AiueNMOMgdUh95tvm39NqVNlCxZCc=; b=OSZxh2v43kH1iHI/jbK6OO7e4N/aPotHXpe/8Dp5Q3EDvJYFvpgvUolNCotdrKKHwP rJmE7bZJSeecCfLlFRCYwvWvnNZZhTKVTnl5Lv8t7d4wlWoaUp5Fgfv9oQZeRzz+RBi4 NES3b/ZS8ikmB3VQ6GIkXKwiZht6HIndfrFni3JWEu3wBGLaSnHZhyzrSv6871MEVzco /t2ZCJq6mMOkT5VxACzJZfQISiCrAYLnolbdViD3OUd6jEN9jjjVgmQs40y3OaV73j9O 3QnLa5ETYulD/pXNXO4B69Ply5R2FG7zbSaWXKQi4L1+HQRWAA/LVNKwndWauDS9LUxG Zi7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=IgI8O8od0hH8X5AiueNMOMgdUh95tvm39NqVNlCxZCc=; b=CJ9zSs+LJtPMP+tdqxEwnYEk4v7SoZlYUnWZodgPq6KzezfUyyCpnpUEWQf0gBuCQR sLSnV+yOlvymLWr67poetIWcOhq3NcAKXNQ1qRHPqO55pwk8orxgva2CcvyKHzz2iwUx NdMB8SRpV4H75UY2y92XdA4mpkduuB6+lJrPjwDqh9sjDV3dblFZnTeNtDYoUaS+ZcUQ yUBrRjqyQ7DGr0PmXoghKfwAKo+Vs2Vd+TIxHQj72S2vrUY7V28hwFLm0SvjGnj0bM28 f0TH+1OE00gAizYBUkB0F8+4G/eNqIpFOW0AimtChOqZ/fU1XMhNqMCcCe3vZMGZ4AYJ vauQ== X-Gm-Message-State: APjAAAW0WOAGNDdtROkJbgBU2FFR+G4zOqaNGGaWodi6dbs0U6Iy3jG8 H7uzl8qiQ2zokM5KC6zUoKIjN1GmyUI= X-Received: by 2002:a63:1013:: with SMTP id f19mr1188954pgl.289.1574811003600; Tue, 26 Nov 2019 15:30:03 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:8500:1c20::e439]) by smtp.gmail.com with ESMTPSA id d38sm13524267pgd.59.2019.11.26.15.30.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Nov 2019 15:30:03 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Tue, 26 Nov 2019 15:29:52 -0800 Message-Id: <20191126232952.3723066-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.24.0 MIME-Version: 1.0 Subject: [oe] [meta-oe][PATCH v2] mercurial: Upgrade to 5.2 and switch to py3 X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Signed-off-by: Khem Raj --- v2: Fix python path during target build .../{mercurial_4.6.1.bb => mercurial_5.2.bb} | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) rename meta-oe/recipes-devtools/mercurial/{mercurial_4.6.1.bb => mercurial_5.2.bb} (56%) -- 2.24.0 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-devtools/mercurial/mercurial_4.6.1.bb b/meta-oe/recipes-devtools/mercurial/mercurial_5.2.bb similarity index 56% rename from meta-oe/recipes-devtools/mercurial/mercurial_4.6.1.bb rename to meta-oe/recipes-devtools/mercurial/mercurial_5.2.bb index 13710aaea3..713685d0f7 100644 --- a/meta-oe/recipes-devtools/mercurial/mercurial_4.6.1.bb +++ b/meta-oe/recipes-devtools/mercurial/mercurial_5.2.bb @@ -3,29 +3,33 @@ HOMEPAGE = "http://mercurial.selenic.com/" SECTION = "console/utils" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -DEPENDS = "python python-native" -DEPENDS_class-native = "python-native" -RDEPENDS_${PN} = "python python-modules" -inherit python-dir +DEPENDS = "python3 python3-native" +RDEPENDS_${PN} = "python3 python3-modules" + +inherit python3native SRC_URI = "https://www.mercurial-scm.org/release/${BP}.tar.gz" -SRC_URI[md5sum] = "f9b2e4a3b5901ef744fa3abe4196e97e" -SRC_URI[sha256sum] = "89fa8ecbc8aa6e48e98f9803a1683ba91367124295dba2407b28c34ca621108d" +SRC_URI[md5sum] = "9ba9d59157c002db8d8cab680de08eb5" +SRC_URI[sha256sum] = "ff030e923f03ee15c91191996fcb099bfcfa60c7df263be227f67b6a65d36194" S = "${WORKDIR}/mercurial-${PV}" BBCLASSEXTEND = "native" +export LDSHARED="${CCLD} -shared" + EXTRA_OEMAKE = "STAGING_LIBDIR=${STAGING_LIBDIR} STAGING_INCDIR=${STAGING_INCDIR} \ PREFIX=${prefix}" do_configure_append () { - sed -i -e 's:PYTHON=python:PYTHON=${STAGING_BINDIR_NATIVE}/python-native/python:g' ${S}/Makefile + sed -i -e 's:PYTHON?=python:PYTHON?=python3:g' ${S}/Makefile } do_install () { oe_runmake -e install-bin DESTDIR=${D} PREFIX=${prefix} + sed -i -e 's:${STAGING_BINDIR_NATIVE}/python3-native/python3:${USRBINPATH}/env python3:g' ${D}${bindir}/hg } FILES_${PN} += "${PYTHON_SITEPACKAGES_DIR}" +