From patchwork Thu Oct 17 11:29: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: 176564 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp781526ill; Thu, 17 Oct 2019 04:30:15 -0700 (PDT) X-Google-Smtp-Source: APXvYqyiC2UTx9B2kLVHEndQLfvlCo2CBy9SxRGnQNGQyGC8fIaWpC2Qr0VhbFLXAoKiPbpTmA9Y X-Received: by 2002:a17:90a:a891:: with SMTP id h17mr3845878pjq.32.1571311815550; Thu, 17 Oct 2019 04:30:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571311815; cv=none; d=google.com; s=arc-20160816; b=Or9ixcLn1gdp+2kssXJoPd1jdVFNK6q5xXVTbHjOJAUz86hSyveaa1YLMTmVX75fVe HxsFyluaqXrEwYFS+h0r+UItpTkRbbfj8bkaAE4B3z9Rs3lE8WEtM4Jqv6Uwx9ryjhIE kSG3Ph4AqCeHpHHY5zgY4ZpKiafyRYkUDLY+Nmn6lRd/7vQ4huC33xJfc5IyX4eYV0ID yz7OzCs1VnT7+KFPnjnpS+ZWycwhfpvXNpeqJ3zdjI1w0TyU4dlBDs2hwDW4kEyYkq9p 4FmmG/pmeKzZoxLrtH2rbkBANT7ZK3S3XUGNvDtHPV4svMe+FRHlD1E3EHojym/DZyXe PTaA== 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:references:in-reply-to:message-id:date:to:from :dkim-signature:delivered-to; bh=RBl4mmBie2YAab3YEhbPNSqSif9uMxoUnUpjCtw+K+8=; b=yK8HPV9PmLxS/NpoFcCmlbw30PFHpp9fZkYg6HFdTOBjR7s/0hmmg6TZgtTAXFwiSQ rC5lZ99GCl62JdnrQQBnA456VJa4sqzd01dNQCwe5W55+fMJBa5y+bghzwImJw6DlCwp T6bslXrDwnUZQvZWOqmePCmpSC/ALojlFjak7x+vw7hkNYNu5aXa4m3/q2FVDumHo0O7 SC7XH2fMNGVwIMjxLpdwaBcZndnXfWzsh9XllyHNgi2/NP9M6lP6g5TfRwv+gd1zQcwb 2NQEyE5QGIqA0Vtf5E+6kcWnz2AycHma5R6CgxH5fbnITB3Q9RiaUFN6/KxDdsaJ7UNd GXPw== 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=KGNJ8MDN; 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 q125si1893368pgq.326.2019.10.17.04.30.14; Thu, 17 Oct 2019 04:30:15 -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=KGNJ8MDN; 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 04A337F593; Thu, 17 Oct 2019 11:30:12 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by mail.openembedded.org (Postfix) with ESMTP id 580797F54D for ; Thu, 17 Oct 2019 11:29:51 +0000 (UTC) Received: by mail-wr1-f66.google.com with SMTP id j18so1912168wrq.10 for ; Thu, 17 Oct 2019 04:29:52 -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:mime-version :content-transfer-encoding; bh=YtLTClkFMDtRhf858v57NWywEheGiqCPabrkbRNHZLU=; b=KGNJ8MDNdi/ifPXBvLb3BDTbjtqDq0K26xpkS6u9Me28Yeg7FaOUIazwU9gEYjViqG oNcHNPRxhq4TG/KBdm4n8DIXSfBMhvMCV2FnUOIZSZUFDl7K7T1d5pHA28xSJ8fsoGYn LDBdLur/UNqNf64bFxQOeNg83MPnEsp2P8VeVfCLQZ3HkSOEXiJogNETZjw2YQJwQGSC nIydzzkmyV/1DblMFQM/0sIa4/1G+vLUzSXI9b1eZIOy50Xwr39SlDX5bRllZBMVlNVp E87xKcE6bz8rKBnaH1gPZG4MXCHLPeoJd+6Re2IZeoQkvuWoWSBbPrONekBbMWcVDCPu fNVA== 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:mime-version:content-transfer-encoding; bh=YtLTClkFMDtRhf858v57NWywEheGiqCPabrkbRNHZLU=; b=oKhoIlm6v3cL3+lQ4EKDdmURYfBVGhG6IhbwhpT9EgIQ0D2qvU4fY2XujglWVVmYEb V8OEcy1Bk5xhle31LutR2o/nCu+58PNVZJ/P0WwKaPnOEJ///H+/lTI0VbDHHKuLNxfR jLQCt3874gMWMUa/oX4cH/S0U93Bh2v3UOZDx776DLkbM9Zbds9X/yMEAbC2NmdKUPzS XTp+VUq8rqbdVw1A2rETqoKg61PSHW1xk6v55n14Hr7o/qbxsCHnR8XjONM4BsYeDk92 XTqdTsObnW0kclUF33SJ6ex+wbYumFxzn1VeSFsr+kaPhmvpVhcxvPtBA3ohDhUGl5Nb j/+g== X-Gm-Message-State: APjAAAVW5lOxMcdzzg0SEU3Jdhvd0aRNpM3sRTYoasHyYC9g5KLqZOio nnq5t1DT5n+WckNd6s9QjueIoPT8ydk= X-Received: by 2002:a05:6000:92:: with SMTP id m18mr2731747wrx.105.1571311791687; Thu, 17 Oct 2019 04:29:51 -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 r2sm1907514wrm.3.2019.10.17.04.29.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Oct 2019 04:29:51 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Thu, 17 Oct 2019 12:29:43 +0100 Message-Id: <20191017112945.345-2-ross.burton@intel.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191017112945.345-1-ross.burton@intel.com> References: <20191017112945.345-1-ross.burton@intel.com> MIME-Version: 1.0 Subject: [OE-core] [PATCH 2/4] python3: ensure that all forms of python3-config are in python3-dev 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: , Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org In multilib builds python3-config gets renamed to eg python3-config-lib64 but this ends up being packaged in python3-core not python3-dev. The manifest uses an extended glob to package all python* binaries that are not python-config into python3-core: "${bindir}/python*[!-config]", However, this doesn't do what was intended, as [] is a range match. Replace the globs with more verbose but precise matches, and clear out FILES_${PN} to ensure that new binaries don't end up in ${PN} (which shouldn't exist). [ YOCTO #13592 ] Signed-off-by: Ross Burton --- meta/recipes-devtools/python/python3/python3-manifest.json | 6 ++++-- meta/recipes-devtools/python/python3_3.7.4.bb | 5 ++++- 2 files changed, 8 insertions(+), 3 deletions(-) -- 2.20.1 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-devtools/python/python3/python3-manifest.json b/meta/recipes-devtools/python/python3/python3-manifest.json index 1ad85a9ff38..cd9dc847a8f 100644 --- a/meta/recipes-devtools/python/python3/python3-manifest.json +++ b/meta/recipes-devtools/python/python3/python3-manifest.json @@ -210,7 +210,9 @@ "summary": "Python interpreter and core modules", "rdepends": [], "files": [ - "${bindir}/python*[!-config]", + "${bindir}/python3", + "${bindir}/python${PYTHON_MAJMIN}", + "${bindir}/python${PYTHON_BINABI}", "${includedir}/python${PYTHON_BINABI}/pyconfig*.h", "${prefix}/lib/python${PYTHON_MAJMIN}/config*/*[!.a]", "${libdir}/python${PYTHON_MAJMIN}/UserDict.py", @@ -487,7 +489,7 @@ "files": [ "${base_libdir}/*.a", "${base_libdir}/*.o", - "${bindir}/python*-config", + "${bindir}/python*-config*", "${datadir}/aclocal", "${datadir}/pkgconfig", "${includedir}", diff --git a/meta/recipes-devtools/python/python3_3.7.4.bb b/meta/recipes-devtools/python/python3_3.7.4.bb index 01230b0fec3..8c429e95c38 100644 --- a/meta/recipes-devtools/python/python3_3.7.4.bb +++ b/meta/recipes-devtools/python/python3_3.7.4.bb @@ -303,11 +303,14 @@ do_create_manifest[depends] += "${PN}:do_prepare_recipe_sysroot" do_create_manifest[depends] += "${PN}:do_patch" # manual dependency additions -RPROVIDES_${PN}-modules = "${PN}" RRECOMMENDS_${PN}-core_append_class-nativesdk = " nativesdk-python3-modules" RRECOMMENDS_${PN}-crypt_append_class-target = " openssl ca-certificates" RRECOMMENDS_${PN}-crypt_append_class-nativesdk = " openssl ca-certificates" +# For historical reasons PN is empty and provided by python3-modules +FILES_${PN} = "" +RPROVIDES_${PN}-modules = "${PN}" + FILES_${PN}-pydoc += "${bindir}/pydoc${PYTHON_MAJMIN} ${bindir}/pydoc3" FILES_${PN}-idle += "${bindir}/idle3 ${bindir}/idle${PYTHON_MAJMIN}"