From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6520143438976909312 X-Received: by 10.25.216.12 with SMTP id p12mr29186lfg.32.1518089193463; Thu, 08 Feb 2018 03:26:33 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 10.25.201.136 with SMTP id z130ls453398lff.13.gmail; Thu, 08 Feb 2018 03:26:32 -0800 (PST) X-Google-Smtp-Source: AH8x224iwnB/yNELUnKAcPj8CTw+kj9wlGUSZ5YCefN+d+Pd1+K6RTlWxFv5UWQjKB7QzAXUdwCj X-Received: by 10.25.156.145 with SMTP id f139mr28438lfe.39.1518089192923; Thu, 08 Feb 2018 03:26:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1518089192; cv=none; d=google.com; s=arc-20160816; b=oByGO4wSZk2oZ2wOQyid7bHIs/P13jgMKzuP1FLZThw8CKTqQVChtXUBgkCNItjTsU WTR9fj6iCmrh2ImTqf+ISliDzNvnkWzLfpfm59Usety523FyvC7wUhGzT3E++X86/ns9 Ul9GPwUbgIJtckyPOJnAmsQ7wJnbobLVC+SnQbkIotWsqkzJs+OfBDRg44KTMawzVX/T +8eJ0s0+1LKCWfeEq9bdCLQ2rMYomOdz7hitxQQhiDIlCPL3UXbIqdPIxCS9nZwq34od xxp3iGDj6aEM1Awmcm+JyhBQZoCO0iIaEXDPixqqhEdZxt0vbTFVwilyyu6x7IQYg264 IBkg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:cc:to:from:arc-authentication-results; bh=wKCf79MtKRENJX+UXgJYNJfC881+41YZPlkVfrU3SUY=; b=pIpObeWBf6v3hjsSoNj7G/jreYg603JFF0YdwZKG74MT71KFbfYIqvw30Pw4lQvt2V KOhELt2/7wjyp3UrS7XY1QDie4+2niHFDNPFmZyJSIGKEPptp00VDh9JvsWQBBQM9WUf HdUBqw8dtJ4oxYgfBJlrsH0/rz5zskhwrFow9lKNp0VicgBZx/N1m4PnVqlz37MI4p70 jVZotqMLSDXzaebdNiZK1LjvVC5B6nhaEhd4dAVOMEFSawigewpnkkAwSCj4b9GP2Iu7 aD4n0xlDCiofa9iDNQLpZbdqYAPanhSKi/iOHlyQ3on5jfBNKhSqiZtXKcKD01QaHpyl wHHA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of claudius.heine.ext@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=claudius.heine.ext@siemens.com Return-Path: Received: from gecko.sbs.de (gecko.sbs.de. [194.138.37.40]) by gmr-mx.google.com with ESMTPS id 25si187418ljt.1.2018.02.08.03.26.32 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 08 Feb 2018 03:26:32 -0800 (PST) Received-SPF: pass (google.com: domain of claudius.heine.ext@siemens.com designates 194.138.37.40 as permitted sender) client-ip=194.138.37.40; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of claudius.heine.ext@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=claudius.heine.ext@siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by gecko.sbs.de (8.15.2/8.15.2) with ESMTPS id w18BQVQr009083 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 8 Feb 2018 12:26:32 +0100 Received: from ring.ppmd.siemens.net (linux-ses-ext02.ppmd.siemens.net [139.25.68.223]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id w18BQVHB032381; Thu, 8 Feb 2018 12:26:31 +0100 From: claudius.heine.ext@siemens.com To: isar-users@googlegroups.com Cc: Claudius Heine Subject: [PATCH] meta/classes/base: Fix showdata and liststasks after bitbake update Date: Thu, 8 Feb 2018 12:26:22 +0100 Message-Id: <20180208112622.3373-1-claudius.heine.ext@siemens.com> X-Mailer: git-send-email 2.15.1 X-TUID: Y6uFLmysguUo From: Claudius Heine Those tasks were broken, this patchs fixes by implementing them similar to how openembedded-core does it. Signed-off-by: Claudius Heine --- meta/classes/base.bbclass | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index 7d44f72..448dd67 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -40,22 +40,28 @@ bbfatal() { addtask showdata do_showdata[nostamp] = "1" python do_showdata() { - import sys - # emit variables and shell functions - bb.data.emit_env(sys.__stdout__, d, True) - # emit the metadata which isnt valid shell - for e in bb.data.keys(d): - if bb.data.getVarFlag(e, 'python', d): - sys.__stdout__.write("\npython %s () {\n%s}\n" % (e, bb.data.getVar(e, d, 1))) + for e in d.keys(): + if d.getVarFlag(e, 'python'): + bb.plain("\npython %s () {\n%s}\n" % (e, d.getVar(e, True))) } addtask listtasks do_listtasks[nostamp] = "1" python do_listtasks() { - import sys - for e in bb.data.keys(d): - if bb.data.getVarFlag(e, 'task', d): - sys.__stdout__.write("%s\n" % e) + taskdescs = {} + maxlen = 0 + for e in d.keys(): + if d.getVarFlag(e, 'task'): + maxlen = max(maxlen, len(e)) + if e.endswith('_setscene'): + desc = "%s (setscene version)" % (d.getVarFlag(e[:-9], 'doc') or '') + else: + desc = d.getVarFlag(e, 'doc') or '' + taskdescs[e] = desc + + tasks = sorted(taskdescs.keys()) + for taskname in tasks: + bb.plain("%s %s" % (taskname.ljust(maxlen), taskdescs[taskname])) } do_fetch[dirs] = "${DL_DIR}" -- 2.15.1