From patchwork Mon Oct 15 18:13:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 148878 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp4108020lji; Mon, 15 Oct 2018 11:13:12 -0700 (PDT) X-Google-Smtp-Source: ACcGV60DAlwokOrVBxuV4fO8mFOp2HoJK2mLTdERugfCDdMfnxMtWiSwmtcIog4n3+HrmDDHAkWd X-Received: by 2002:a17:902:654e:: with SMTP id d14-v6mr18038676pln.292.1539627192066; Mon, 15 Oct 2018 11:13:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1539627192; cv=none; d=google.com; s=arc-20160816; b=pcKMY0+JIahewVb/lZp0fUHscVeHMw+hyjGha7wiRb8noE/acisiWsjJAfWe9KiHXE 859t+63dSQ9nWPWu9v4JU7Rt3rrwbQyOgYKxcqnpVmRMKWVktwW6WP3WaS3EZkmHL/Lv z4NFpgobfWhGM+tpuuPWWQl3j/8885flVeRFwj92bQLF8ZgIPli7v1tVS5I+umPoO5u9 eMgczZbu6xSr/YlgFv8/vtqiUT4L7Y7NAYlCC/56A+NiHFSubdOfXvwgOtb+lcezgxNH sApBUZTd/9+Sm/rQur5X/h4/8QLHr7SrZhHlkAfVuGnJL6R3Sj36fx/Ee3ivbtbDTedk WpgA== 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=QTZzRS2VAH7ykmRweVSdbdAk9rEi0x68JfSk942DWzE=; b=oRrZWDObWX4J0yk3JNPrylWWXT2abJLnWX3jUOp/pWAdGXLXQtjpU5nNCRSpIH637o ThSP2Qe3ML28P6AH7oa2bVFLnaRsKZb+qXmbISMMOLloDnqXSamn3hAQXNHqfV2EcUF2 d6bdG4thk01mLTfna4+A03bdkAHPipT6REKkKvX12Xueo3w9wYrO6l4xGScvN89v1G9b awYadkofI8VwXOV7ZtyIa/Cix5PxMnsubNLoexMq7e2pie/Z/rBdG8vyaBWhmweJMApU 51xICRXDgV8wpDhovM+wLz/Y2PZW3m5gKYOc8Dr5QzqLNYti2tgXDQ+vc23sfYHpTrfJ ZiMg== 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="R3WtsLr/"; 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 a6-v6si11020897pgi.160.2018.10.15.11.13.11; Mon, 15 Oct 2018 11:13:12 -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="R3WtsLr/"; 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 165.28.230.35.bc.googleusercontent.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 051B67948B; Mon, 15 Oct 2018 18:13:07 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by mail.openembedded.org (Postfix) with ESMTP id D9B4460402 for ; Mon, 15 Oct 2018 18:13:05 +0000 (UTC) Received: by mail-wr1-f65.google.com with SMTP id y11-v6so22426812wrd.4 for ; Mon, 15 Oct 2018 11:13:07 -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=8RDiIL0GIQ2rj2GYWArqHPOKrnWmmvEe4eNB8da5wnI=; b=R3WtsLr/lKf0f2Zs/np8WEwxj8NujDTJdo5DOnNqx+KmDlnwSrrt5/0fmVhZKWyZNI vh6idG/WR6GSHGsJhj3aivvKjgaqEJddVF5pvHkFuzHSkLzwNF/TAA47uwUkwHMDiUz1 /t+sWubGWLjYP0Ev2mFeTijM6BbecMV3WQWb1YIS/9sDeCslA1GNFrp7A9DptIB9VHXL n3HBzdz+Y6b0lL7A5fb2ONm6qls64BTj/M+Aux1vawket8qVuLL2v5X5itH7mEYAtnWO fRne7bnHUHWadXnD8nutkR/t9zmuXors5a28wzWVf9I+BN8yUpSAk3TVvpZ9kmCGhw0W /E8A== 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=8RDiIL0GIQ2rj2GYWArqHPOKrnWmmvEe4eNB8da5wnI=; b=iI3WCGnFQH2iDhiy/8mlBaBrUpCGJnL4rO6XyeaOaTGEwiXcPCq3VDuMvR3TztiK2m u3K/Ba5qf6uhjwyfB3IW0Oy3+vq4s0Dd+GAqe8ZupBpMLylTo2Auh0U/NkzKsJ0Vpw1R PXgioSi0fbwpFMU7e85OSKbYZTfJ5zq4RmxNtWOOc34XjdXGERrvw3vAkgxr4PbKoMTy 2seM2H28d56SrRPZ8jfYPQYEas1HY7sciqItKNRT4c9XkJZTMlzPKho/97+5MZajcOnM qancTbwUR7oEzF/ccbn5MRZaqppcCgUzxvGRmT1aPhRxuhOyD6BBMalo6WqS3QwNOzrl zfsg== X-Gm-Message-State: ABuFfojq84V0VKZx8pRuRQzOX43eB4rFU/ontE7BXcH9qInMxKw/ZJAl 8LJi22Qf6tzNiEAgTuUNwPT6D2Lpy8g= X-Received: by 2002:adf:f712:: with SMTP id r18-v6mr15580281wrp.85.1539627185989; Mon, 15 Oct 2018 11:13:05 -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 t3-v6sm9551698wru.47.2018.10.15.11.13.04 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 15 Oct 2018 11:13:05 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Mon, 15 Oct 2018 19:13:01 +0100 Message-Id: <20181015181302.9865-1-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 Subject: [OE-core] [PATCH 1/2] python: don't wipe RDEPENDS when parsing manifest 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 We want to allow the main recipe to extend RDEPENDS directly, so don't wipe RDEPENDS when reading the manifest. This fixes the missing python-misc dependency from python-modules. As the wiping was having the good side-effect of removing the PN-dev dependency on PN (which doesn't exist), clear RDEPENDS_${PN}-dev. Signed-off-by: Ross Burton --- meta/recipes-devtools/python/python3_3.5.6.bb | 3 ++- meta/recipes-devtools/python/python_2.7.15.bb | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) -- 2.11.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-devtools/python/python3_3.5.6.bb b/meta/recipes-devtools/python/python3_3.5.6.bb index 372f27b15dc..72478f8663d 100644 --- a/meta/recipes-devtools/python/python3_3.5.6.bb +++ b/meta/recipes-devtools/python/python3_3.5.6.bb @@ -245,6 +245,8 @@ FILES_${PN}-man = "${datadir}/man" RDEPENDS_${PN}-ptest = "${PN}-modules ${PN}-tests unzip bzip2" +RDEPENDS_${PN}-dev = "" + BBCLASSEXTEND = "nativesdk" RPROVIDES_${PN} += "${PN}-modules" @@ -288,7 +290,6 @@ python(){ for value in python_manifest[key]['cached']: d.appendVar('FILES_' + pypackage, ' ' + value) - d.setVar('RDEPENDS_' + pypackage, '') for value in python_manifest[key]['rdepends']: # Make it work with or without $PN if '${PN}' in value: diff --git a/meta/recipes-devtools/python/python_2.7.15.bb b/meta/recipes-devtools/python/python_2.7.15.bb index e3a4ddb3274..d78400b6e61 100644 --- a/meta/recipes-devtools/python/python_2.7.15.bb +++ b/meta/recipes-devtools/python/python_2.7.15.bb @@ -177,6 +177,8 @@ FILES_${PN}-man = "${datadir}/man" # Nasty but if bdb isn't enabled the package won't be generated RDEPENDS_${PN}-modules_remove = "${@bb.utils.contains('PACKAGECONFIG', 'bdb', '', '${PN}-bsddb', d)}" +RDEPENDS_${PN}-dev = "" + BBCLASSEXTEND = "nativesdk" RPROVIDES_${PN} += "${PN}-modules" @@ -220,7 +222,6 @@ python(){ if value.endswith('.py'): d.appendVar('FILES_' + pypackage, ' ' + value + 'c') - d.setVar('RDEPENDS_' + pypackage, '') for value in python_manifest[key]['rdepends']: # Make it work with or without $PN if '${PN}' in value: From patchwork Mon Oct 15 18:13:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 148879 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp4108226lji; Mon, 15 Oct 2018 11:13:23 -0700 (PDT) X-Google-Smtp-Source: ACcGV60f5mQv5VtmlsTx2dIr++ZyfzpDnJK3kbqS6gPFHN0UR34sPnPn9v0wOpWKCqYTmg8BKAAu X-Received: by 2002:a62:85cb:: with SMTP id m72-v6mr18488950pfk.173.1539627203569; Mon, 15 Oct 2018 11:13:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1539627203; cv=none; d=google.com; s=arc-20160816; b=spr1072yBtzY/D0ZeAn8ZXCTNBKzHMk0xGCuCmJHiLgd7UHDvRpgut+Y68Q+69iTDW 61FgNAFGELS7wa8+cjnFStVXtV+VqmODnSCw/ZTfjXMYmxNNRVnceAVyq09M/po7eEWF 4BadjwQ4WyVmTlWWBFEB0RfNcJhDghDwInMwv4q6jQGQywYTHaftrzNwekX5UtJAhbbB NaIGNPc7L5WYdr1uswcC+fjHSMlcdE6dA0Fe8nfohdobmjhFWNJ4jNl/UufLgI9+UO6h tr7K+AMzpyDp3BIxgrMORLJbTB1PppjH8hhLI02Wf3jLh8pmOFbUp8bc6SA0g0ss9AQX K28A== 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=rmw+GnR4obADZK1iohx4tG0gFJq9mtqdQPRYjV7h1pA=; b=W7VaqjCZCnU6ELWE84s/8IjtxL3ctiSLxxXSYJxue9dstHFtNEYUobovF4g2c7aOsR gwt6GwBpW2db+wqGkb3tMBqJkTGUZg9VPNAFiG0XSCjL987sD3DkTfTNpYBzwDcW2/wr K/G+1PbpjJIYcj+6lK1bSiec0GiPf/wzRGNiHysofTt4thKWVj0T1iXwVwSMFyUEiX5Z lyLPMpWYt2N/z+8e++FVgbleo1x6V9RKUCxb1iAY2cSm+u2XclKpP1NIXi++o6xWAyqb 8Q7haDHKUWyMCGVusOX0Z9X3doDl62f603M1rMCXnUUUkcUOmGRcrmjqpowfXzsI8lVL cYyA== 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=JlZMnsGi; 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 x12-v6si5107680plv.147.2018.10.15.11.13.23; Mon, 15 Oct 2018 11:13: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=JlZMnsGi; 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 165.28.230.35.bc.googleusercontent.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 93822797CC; Mon, 15 Oct 2018 18:13:20 +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 060B460402 for ; Mon, 15 Oct 2018 18:13:06 +0000 (UTC) Received: by mail-wr1-f44.google.com with SMTP id x12-v6so22429517wru.8 for ; Mon, 15 Oct 2018 11:13: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:in-reply-to:references; bh=07reqXxoOvfGD6p1n8KH3saTzajlkN5PIF7OcGdYrZ8=; b=JlZMnsGi5Ws9kqGfD6FJ8l+XkgKw4jDj8BIZKngo6MoaymmV3+JuF5Z9rvRh6t6VCg QWX0seGovcdUZhSnNMpglVLDSDbd4xfdzVNSDJnfAeEqxLkeBt1Bl0jmgo+NU0uA67R4 Lp1OTANftppLAvTuBOgvelsX18yhp1YtU50Vy3n46FxFFQ9Qj2aV3vfg6FekZrV/sbRW Gokdx4FS63YaJkF0LDEpAvIlWKRlZtY9h5MvSa+At6AvESh0wqDNDATWtBS8CJBB/LOK EBRpoAEWdT8FoGRs1Fl6EoBuATMu097ZoYKNMlTQaloFMwevYNhDB/SpnZJBqRJj9d6l 5DZw== 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=07reqXxoOvfGD6p1n8KH3saTzajlkN5PIF7OcGdYrZ8=; b=jFi4/yaEnjLRhkknN915EN6t+E/HYo6kxTcrV5iQ82kxocNW1XmRTPfJ6wx4BT1ySp GBPUI0z+lbNzMoafOkANC0H/Hz1ucI7sKvyZj7U05u9PhboXiaW1YsQNiXpRVRaxOYHF xTshPm9N7BeN63xp9xNYm8jnfox8EkcYVQ1uovUGcUDEbccULeeVrkoSb9wKffYyMvLf NFGMNpt/DFwQowQqb9W+Q8i5GSw37LUB38/RmGhPnTBc5qdm10/CIubAApqJoSk+AXq6 kwg8gLyMSsNFfgB+0hHVpV3MrJ1xoegzLTfNmze+OqiXZk5uE8N5ieQRmqfLgGi9yE2g 42HQ== X-Gm-Message-State: ABuFfog8MnduQ7Q1SoAJEXYoEzDl1AbxvwQxIszbjwvkjIz95m5SLSEc bd/OxxN1dlfNlLxeT0KIBhkAFspDf3Y= X-Received: by 2002:adf:a201:: with SMTP id p1-v6mr15381797wra.89.1539627187297; Mon, 15 Oct 2018 11:13: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 t3-v6sm9551698wru.47.2018.10.15.11.13.06 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 15 Oct 2018 11:13:06 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Mon, 15 Oct 2018 19:13:02 +0100 Message-Id: <20181015181302.9865-2-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20181015181302.9865-1-ross.burton@intel.com> References: <20181015181302.9865-1-ross.burton@intel.com> Subject: [OE-core] [PATCH 2/2] python: remove the PN package entirely 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 Nothing should be in this package, so remove it entirely to be sure nothing does end up in there. Signed-off-by: Ross Burton --- meta/recipes-devtools/python/python3_3.5.6.bb | 4 ++-- meta/recipes-devtools/python/python_2.7.15.bb | 3 +-- 2 files changed, 3 insertions(+), 4 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/python/python3_3.5.6.bb b/meta/recipes-devtools/python/python3_3.5.6.bb index 72478f8663d..2a4547694ae 100644 --- a/meta/recipes-devtools/python/python3_3.5.6.bb +++ b/meta/recipes-devtools/python/python3_3.5.6.bb @@ -215,6 +215,8 @@ py_package_preprocess () { mv ${PKGD}/${bindir}/python${PYTHON_BINABI}-config ${PKGD}/${bindir}/python${PYTHON_BINABI}-config-${MULTILIB_SUFFIX} } +PACKAGES_remove = "${PN}" + # manual dependency additions RPROVIDES_${PN}-modules = "${PN}" RRECOMMENDS_${PN}-core_append_class-nativesdk = " nativesdk-python3-modules" @@ -249,8 +251,6 @@ RDEPENDS_${PN}-dev = "" BBCLASSEXTEND = "nativesdk" -RPROVIDES_${PN} += "${PN}-modules" - # We want bytecode precompiled .py files (.pyc's) by default # but the user may set it on their own conf INCLUDE_PYCS ?= "1" diff --git a/meta/recipes-devtools/python/python_2.7.15.bb b/meta/recipes-devtools/python/python_2.7.15.bb index d78400b6e61..b402ad6f1e7 100644 --- a/meta/recipes-devtools/python/python_2.7.15.bb +++ b/meta/recipes-devtools/python/python_2.7.15.bb @@ -152,6 +152,7 @@ py_package_preprocess () { (cd ${PKGD}; python -m py_compile ./${libdir}/python${PYTHON_MAJMIN}/_sysconfigdata.py) } +PACKAGES_remove = "${PN}" # manual dependency additions RPROVIDES_${PN}-core = "${PN}" @@ -181,8 +182,6 @@ RDEPENDS_${PN}-dev = "" BBCLASSEXTEND = "nativesdk" -RPROVIDES_${PN} += "${PN}-modules" - # We want bytecode precompiled .py files (.pyc's) by default # but the user may set it on their own conf