From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6520143438976909312 X-Received: by 10.28.237.21 with SMTP id l21mr145691wmh.32.1518098150757; Thu, 08 Feb 2018 05:55:50 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 10.223.142.69 with SMTP id n63ls1416729wrb.11.gmail; Thu, 08 Feb 2018 05:55:50 -0800 (PST) X-Google-Smtp-Source: AH8x224pQ5ZGvz4L/Tu/2UFF/CUH+BMHlGYnEV+MsLYRVkRCBLsOYqCzlGaOLAahGVLe5QcqcLeE X-Received: by 10.223.196.157 with SMTP id m29mr107278wrf.26.1518098150278; Thu, 08 Feb 2018 05:55:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1518098150; cv=none; d=google.com; s=arc-20160816; b=tPAMnr6xFiswM/pJkq7tcIcegn7yzEfIeU6b6o4ngHUBXSNT0iyxrBZUD2Xc5PUhJa m+4mmGBsgzI/4QKKezt5O5ezfiS2b26dgn2DD3EV49HH1LwPHPYaIgADXQcbmge//PdG HU0k60J4bjqNPT2Hl9XsA4JGkilnQ2eMB5zsXje7LtkJO1C/Ax1y6bUczs4gAioDp8Nj xge0x5xIAr2q4Bh+LbOpsRJqYI7EmdenSDjGAuUtdItRgknS64Pp4kmfR1yYXu7QahyK uswCgWap3EBOJOJC+o6MBaEhdwa2wE6u6z0XpVoffbAtklrNwsksSyYnlMHyOUiWs5+I cMJg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:content-language:in-reply-to:mime-version :user-agent:date:message-id:from:references:cc:to:subject :arc-authentication-results; bh=+PZauKByPLitsDCfmJ8RribhFn5xfondepZAMBB6vwY=; b=KhWrM55Irs1gHvnKlXikdyXgWmzvOV9RDpQoM6qin6/G2oypmIaLwPYt7ugIcJMEDK VcXJ8weXHFzpidO7NeJjQRV7LJ590vSK236T6+XoKhJw/sCl9DVyqRV/0qAk2Ke3NIos VuTzOU9m97KhobcetGT4TPWVm5WVDDFgFiDySAFN1Is++stv6L7OKnJ//ylvLqa0V20D Y7A9h9MlGanDkvh+Kodwwagr86XP9XOH6tinK+82mnJ2nMq8B5NFk/mG3IRejp1VX2xC F586jXiZ3An5JDn4bIgqxXbcl0Kn7Vq0OqUAgp0zyq9/L2ZClN49AbbK4I1MKHlTeugh Pgww== 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 g70si11885wmc.3.2018.02.08.05.55.50 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 08 Feb 2018 05:55:50 -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 [10.0.2.15] ([188.227.110.165]) (authenticated bits=0) by aqmola.ilbers.de (8.14.4/8.14.4/Debian-4+deb7u1) with ESMTP id w18DtjlS000461 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NOT); Thu, 8 Feb 2018 14:55:47 +0100 Subject: Re: [PATCH] meta/classes/base: Fix showdata and liststasks after bitbake update To: claudius.heine.ext@siemens.com, isar-users@googlegroups.com Cc: Claudius Heine References: <20180208112622.3373-1-claudius.heine.ext@siemens.com> From: Alexander Smirnov Message-ID: Date: Thu, 8 Feb 2018 16:55:39 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.3.0 MIME-Version: 1.0 In-Reply-To: <20180208112622.3373-1-claudius.heine.ext@siemens.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: YcAcmVHfiIHS Hi, On 02/08/2018 02:26 PM, claudius.heine.ext@siemens.com wrote: > From: Claudius Heine > > Those tasks were broken, this patchs fixes by implementing them similar > to how openembedded-core does it. > I see that this code is identical to OE one, do you know which copyright it is? If this code is copied from OE, I think it makes sense to mention this explicitly in the code. Alex > 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}" >