From patchwork Fri Sep 21 11:48:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 147249 Delivered-To: patch@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp714134ljw; Fri, 21 Sep 2018 04:49:11 -0700 (PDT) X-Google-Smtp-Source: ANB0VdY3vk0wuQDrN8z7mhPejdolYCd+3AdO6vqac4r+hdX8PZB3Qm86VpkaoggafmPv1s0xqR+d X-Received: by 2002:a62:9cd7:: with SMTP id u84-v6mr46228774pfk.90.1537530551370; Fri, 21 Sep 2018 04:49:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537530551; cv=none; d=google.com; s=arc-20160816; b=CcBkJDVMPpdGN6hnl1L4HMi4RTSzwiX8AM5UTwMsc0/bBOCQ+24ISyfK2C06VsF+ya w5AvneuVr9c6IvStJK0cRsed1Njaf/iteulX5tekyZGxMyZ5ge/XLEJXsu41vOnJaMZz mdL0ddW6im+izC1Kod6rbQpneABxwl/Hg/vyq62YDfcgGgiSOe43DOq7M9vDWpk6EVOW PYW9akg/h6uv0kOEimDcFJcB8h1Y4SnX7kYqDqMvzVwFfai+VaDlOjhQ+CckH2UsMWil wyO72QpfvvIXdAsB6Lzr7XSyaSEpJ3zcINzXqLnGpgn6xpB/fQLoTdVV7yJZJS+le7Wd Nkeg== 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=jBdMCP03CY0Sd3WofRq/UQggHDpkLADKUdQlDeSC43o=; b=UqqWTyAHi78x1PKT3U92AxlMLHMMNHlSwTCU+T8lcOehCDb/qqv+oSQIG1pFhgNlvn dWCojov3GRgp/akgahKHv7All+Ye6m07I5psqBujyPRU24xbHX/mshWC/AiwA2iBSWVZ Z5DsEl7FJWHS4qKUZgSU9ZJVJE0timWL9Q3EdRAmyy2RfisTNpexK1w23vxAiAzHOP7h XQdlUyjW/ywTZrjjvOpq+4/eN048+3NfPzXOZIR2W0ouXQYcz+mF/iqgqSLk+imm8QuC rPTeKIC8cdVTZ1X+9F97ETIE/TfnbycYNu8/ieb8dHIRK5ZB30vfWEIcRbyLm7ZQQmn6 3//Q== 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="B1a/u8XE"; 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 p91-v6si27289962plb.51.2018.09.21.04.49.11; Fri, 21 Sep 2018 04:49: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="B1a/u8XE"; 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 layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 532BD798D6; Fri, 21 Sep 2018 11:49:09 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) by mail.openembedded.org (Postfix) with ESMTP id 80D87798C8 for ; Fri, 21 Sep 2018 11:49:07 +0000 (UTC) Received: by mail-wr1-f48.google.com with SMTP id j8-v6so8836617wrw.5 for ; Fri, 21 Sep 2018 04:49: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=r9oeJ/pG0E4MFOdvY52G4642w+DLvib6Gt5xT17q6vc=; b=B1a/u8XErYH0QzjjVFxfbtRVpx8T3JzPPPoha+lKlwR7gfw4twGywYj4PKGWrByY+O 7NOjpt/XtpXYJer4KhMqurPodc9PO+2JNrMJy2X/BQSKddoDQuxL1OF5BU4KGacyZNLN fxWMtlKvGUjiqQIYj1dXz/mMsuk0jAJoWsVUbThODpNneqfTh+FSzK9oLrIjMZ7l8L+l KP//IjAAJb0ysImnSmJSRYOUMJBSV4UjRAqek0MtxY+ehxtCrmERRAh44lsPbN9k2vhU KmuhGwchU83eO12rQPxI2BX+Au781viY5a/xBRNva6N7nSCAoZRsqshYRzfv6a9vonz4 h2ng== 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=r9oeJ/pG0E4MFOdvY52G4642w+DLvib6Gt5xT17q6vc=; b=ksfdTl4UBJ8uzCEe/S+nOxvCJsA7fTec5+GPdrcBG6Vok7Odkyrl8TkrfsS2aeGKWK +cTvvEndzL84bo2LFlS/adCxfYMwBdFlO4DO6O9vRIzbd4/Edp60k1QogpNZjYZkCupP hknh4rw5x+6WShKfdMRV504Mi9V92UAx/Kc6RTaoxdfdmdzULjOjIneX7aXkaVdcCamU VXpbhXxwW7QT8oWitpGzqyshxHLQgUaDaQwG2gGZSaqJ5Aq8e4og85fICmLZpdH72jG8 gt8mFxJdRt37bgej6gs+z3PuoolIH2hoF3RwlK1wMm6SOGYxFdww9Zxm57IueU2wn2yB Xh+Q== X-Gm-Message-State: APzg51CxRDKoWPf+fs9pfEG2sCjcDSIG2Eu9L8dVLidv/lXwh+t0aZxD ZxETNeHw0MLcIim1Qz2umXQWMHF+oxA= X-Received: by 2002:a5d:608b:: with SMTP id w11-v6mr39385075wrt.193.1537530547799; Fri, 21 Sep 2018 04:49: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 n8-v6sm3479850wrw.31.2018.09.21.04.49.06 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 21 Sep 2018 04:49:07 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Fri, 21 Sep 2018 12:48:58 +0100 Message-Id: <20180921114900.26338-2-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180921114900.26338-1-ross.burton@intel.com> References: <20180921114900.26338-1-ross.burton@intel.com> Subject: [OE-core] [PATCH 2/4] python3: respect package order in 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 Don't sort the manifest when using it to generate packaging rules, so ordering can be used to have complex packaging rules. Signed-off-by: Ross Burton --- meta/recipes-devtools/python/python3_3.5.6.bb | 6 ++---- 1 file changed, 2 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 605ea6abfe7..6085e36b7db 100644 --- a/meta/recipes-devtools/python/python3_3.5.6.bb +++ b/meta/recipes-devtools/python/python3_3.5.6.bb @@ -252,7 +252,7 @@ RPROVIDES_${PN} += "${PN}-modules" INCLUDE_PYCS ?= "1" python(){ - import json + import collections, json filename = os.path.join(d.getVar('THISDIR'), 'python3', 'python3-manifest.json') # This python changes the datastore based on the contents of a file, so mark @@ -260,7 +260,7 @@ python(){ bb.parse.mark_dependency(d, filename) with open(filename) as manifest_file: - python_manifest=json.load(manifest_file) + python_manifest=json.load(manifest_file, object_pairs_hook=collections.OrderedDict) include_pycs = d.getVar('INCLUDE_PYCS') @@ -294,8 +294,6 @@ python(){ d.appendVar('RDEPENDS_' + pypackage, ' ' + pn + '-' + value) d.setVar('SUMMARY_' + pypackage, python_manifest[key]['summary']) - # We need to ensure staticdev packages match for files first so we sort in reverse - newpackages.sort(reverse=True) # Prepending so to avoid python-misc getting everything packages = newpackages + packages d.setVar('PACKAGES', ' '.join(packages))