From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from bastet.se.axis.com (bastet.se.axis.com [195.60.68.11]) by mail.openembedded.org (Postfix) with ESMTP id 9921579CF9 for ; Fri, 19 Oct 2018 16:15:23 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by bastet.se.axis.com (Postfix) with ESMTP id 2B04C18399 for ; Fri, 19 Oct 2018 18:15:24 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at bastet.se.axis.com Received: from bastet.se.axis.com ([IPv6:::ffff:127.0.0.1]) by localhost (bastet.se.axis.com [::ffff:127.0.0.1]) (amavisd-new, port 10024) with LMTP id UX9jgWuUbHwK for ; Fri, 19 Oct 2018 18:15:23 +0200 (CEST) Received: from boulder02.se.axis.com (boulder02.se.axis.com [10.0.8.16]) by bastet.se.axis.com (Postfix) with ESMTPS id 51B971827E for ; Fri, 19 Oct 2018 18:15:23 +0200 (CEST) Received: from boulder02.se.axis.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 3A8F21A063 for ; Fri, 19 Oct 2018 18:15:23 +0200 (CEST) Received: from boulder02.se.axis.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 2F6811A062 for ; Fri, 19 Oct 2018 18:15:23 +0200 (CEST) Received: from seth.se.axis.com (unknown [10.0.2.172]) by boulder02.se.axis.com (Postfix) with ESMTP for ; Fri, 19 Oct 2018 18:15:23 +0200 (CEST) Received: from lnxolofjn.se.axis.com (lnxolofjn.se.axis.com [10.92.17.1]) by seth.se.axis.com (Postfix) with ESMTP id 234081037 for ; Fri, 19 Oct 2018 18:15:23 +0200 (CEST) Received: by lnxolofjn.se.axis.com (Postfix, from userid 20466) id 1187B9C121; Fri, 19 Oct 2018 18:15:23 +0200 (CEST) From: Olof Johansson To: openembedded-core@lists.openembedded.org Date: Fri, 19 Oct 2018 18:15:23 +0200 Message-Id: <20181019161523.24032-1-olofjn@axis.com> X-Mailer: git-send-email 2.11.0 X-TM-AS-GCONF: 00 Subject: [PATCHv3] devtool-source.bbclass: Only create each patch branch once 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: , X-List-Received-Date: Fri, 19 Oct 2018 16:15:24 -0000 For conditonally applied patches based on SRC_URI overrides, the devtool-source class would try to create a new branch for each override assignment as a postfunc to do_patch, but if the same override was used multiple times, it would try to create the same branch multiple times, causing errors like > Exception: bb.process.ExecutionError: Execution of \ 'git checkout f0f0f0f0f0ff0f0f0f0f0f0f0f0f0f0f0ff0f0f0 -b devtool-override-foo' \ failed with exit code 128: > fatal: A branch named 'devtool-override-foo' already exists. This change makes sure that the devtool-source bbclass will only create one branch per override. Signed-off-by: Olof Johansson Reviewed-by: Peter Kjellerstedt --- meta/classes/devtool-source.bbclass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- v1 -> v2: Peter Kjellerstedt pointed out some issues with v1; this updated change is simpler. In addition to what Richard said about it causing failures in oe-selftest. I had a issues running oe-selftest, mostly because of the large storage requirements of /tmp and issues with company internal git hooks. I think I managed to run all the tests with passing results now, but please be vigilante of testcase failures; sorry in advance! v2 -> v3: it seems i can manage to use git send-email/format-patch properly today due to serious pebkac issues, sorry for the spam. Remove change-id and re-add the patch "changelog". diff --git a/meta/classes/devtool-source.bbclass b/meta/classes/devtool-source.bbclass index 67cd0bafb20..1372e32c9e5 100644 --- a/meta/classes/devtool-source.bbclass +++ b/meta/classes/devtool-source.bbclass @@ -183,14 +183,14 @@ python devtool_post_patch() { extra_overrides = d.getVar('DEVTOOL_EXTRA_OVERRIDES') if extra_overrides: - extra_override_list = extra_overrides.split(':') + extra_overrides = set(extra_overrides.split(':')) devbranch = d.getVar('DEVTOOL_DEVBRANCH') default_overrides = d.getVar('OVERRIDES').split(':') no_overrides = [] # First, we may have some overrides that are referred to in the recipe set in # our configuration, so we need to make a branch that excludes those for override in default_overrides: - if override not in extra_override_list: + if override not in extra_overrides: no_overrides.append(override) if default_overrides != no_overrides: # Some overrides are active in the current configuration, so @@ -208,7 +208,7 @@ python devtool_post_patch() { else: bb.process.run('git checkout %s -b devtool-no-overrides' % devbranch, cwd=srcsubdir) - for override in extra_override_list: + for override in extra_overrides: localdata = bb.data.createCopy(d) if override in default_overrides: bb.process.run('git branch devtool-override-%s %s' % (override, devbranch), cwd=srcsubdir) -- 2.11.0