From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6520143438976909312 X-Received: by 10.46.85.4 with SMTP id j4mr240901ljb.43.1518197346188; Fri, 09 Feb 2018 09:29:06 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 10.25.239.27 with SMTP id n27ls160115lfh.2.gmail; Fri, 09 Feb 2018 09:29:05 -0800 (PST) X-Google-Smtp-Source: AH8x227WiMh5+UFpM4FCb1tnAI1hds926gil251kCCG+EGJvOhLMK1tj8jMkjLTzEVbnD84UGDHe X-Received: by 10.25.81.154 with SMTP id g26mr285725lfl.15.1518197345700; Fri, 09 Feb 2018 09:29:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1518197345; cv=none; d=google.com; s=arc-20160816; b=bErUWs5BSHsUam3JtrmHmIuJW1MXGCfnZ7gtZPrFlXujCY8NwDL+9tvz3iEzMC/tXA jJaFQOEb4Mxdc1UA4iV6lR/6ogMtbQubE664PIBas67zrSm7di6zjcA7xrXjqopVxgf4 m3/5DkL0k3w20G+orFlruukZVoGg+fs8kNXJi2gobcD+vOBpcnrwRTIM6w303HU0war5 5gVy+VuomM70PWpopEz540ADajeUgOgLzfLbq0yDEYLbtbM3ClMryT7Jzp6q6N5mI+u2 JmVdbn57vEjAjeftw2sgdJd1ODvKWgcvnHbwcxr/AhDtg17Ye0IISKp+Vv+Uwdb1C/fx 4aEg== 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=fl0FFc4lLPGxyeObSLBthmF9mrdekLPYqJgDeaIguNc=; b=PQFtB/crLZHvUBgxVymEMxLfZhUDhzVYb+xVi6Q9SkhZuRCOezYQAlheDC6OEb8Bce OJ6lCwsxsq12iGBe3KvlPlDgKTc/EdPMCW+mcLcLrmy32C+ipMGtOagK2BUPnf0GslN5 +yA3B0+6E+jNbXoPw8FR1VfmxyL/2NIeANJm/XzFy0PP7+eodCTLC2SEgScsBlFLCDqW /xOVmR11CCxeuREmuc6RPlTS7mskJHl2ZMdaTl0Sv9XmILMDVqsY60dDnNjRb0QMix1T mDV1AOog7glFU4vscMVftP21H/86Xr6nNgIE/9rEZAbT9OPxNfBd/mk8fa61YI384eiL vJOg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: best guess record for domain of asmirnov@ilbers.de designates 85.214.62.211 as permitted sender) smtp.mailfrom=asmirnov@ilbers.de Return-Path: Received: from aqmola.ilbers.de (aqmola.ilbers.de. [85.214.62.211]) by gmr-mx.google.com with ESMTPS id c23si153452lfg.0.2018.02.09.09.29.05 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 09 Feb 2018 09:29:05 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of asmirnov@ilbers.de designates 85.214.62.211 as permitted sender) client-ip=85.214.62.211; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: best guess record for domain of asmirnov@ilbers.de designates 85.214.62.211 as permitted sender) smtp.mailfrom=asmirnov@ilbers.de Received: from localhost.localdomain ([188.227.110.165]) (authenticated bits=0) by aqmola.ilbers.de (8.14.4/8.14.4/Debian-4+deb7u1) with ESMTP id w19HSwGC016185 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 9 Feb 2018 18:29:03 +0100 From: Alexander Smirnov To: isar-users@googlegroups.com Cc: Claudius Heine Subject: [PATCH v2] meta/classes/base: Fix showdata and liststasks after bitbake update Date: Fri, 9 Feb 2018 20:28:50 +0300 Message-Id: <20180209172850.28852-1-asmirnov@ilbers.de> X-Mailer: git-send-email 2.9.5 X-TUID: zDJcyvqZES/g From: Claudius Heine 8<-- Just added references to origin code in comment. Didn't touch the code. 8<-- 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 | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index 7d44f72..ae84677 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -37,25 +37,33 @@ bbfatal() { exit 1 } +# Derived from bitbake: bitbake/classes/base.bbclass 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))) } +# Derived from Open Embedded: openembedded-core/meta/classes/utility-tasks.bbclass 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.1.4