From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6520143438976909312 X-Received: by 10.28.178.207 with SMTP id b198mr392476wmf.0.1518421469835; Sun, 11 Feb 2018 23:44:29 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 10.28.167.75 with SMTP id q72ls880135wme.0.gmail; Sun, 11 Feb 2018 23:44:29 -0800 (PST) X-Google-Smtp-Source: AH8x226fA9iBcIZxYV6CJOzT6okhEHXDkK22nQAptHCQB4QaZi6GP9ptEKrv4OGlUMlI2BAt3Orm X-Received: by 10.28.57.139 with SMTP id g133mr310593wma.28.1518421469267; Sun, 11 Feb 2018 23:44:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1518421469; cv=none; d=google.com; s=arc-20160816; b=Jvh9gTCrIIHb2l/+SiMgWBASUhKIT/9/TY2g4PXBz+ft7Eg+5TMY1YC8d2njnNHTfl 1uUHINGQBoXk/F7st3vgvtgeKnwBLp2bi+dNb22yX6z1hIjKKu0ZrSAMKEJHcO1yKVza t6AotfaZDske8zzmXo9rRWCYh4Dr7YfXMrKO5AHa78txnltBde8e2xK0mM8X+E+FXeso F5+GfnhTEpDvfXU8fRBZOyQbaDCmOdpgPSOsooyJBJVyXDH1CQojrlxXr1yZhzhylw/o piqd4x0epiZfIHp7fzUEvdjVwRsWkuuMh7VbtVVz3llpoD71dDfRROhqi2ylci7IbYQk RrBA== 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=Sg3FOBVSPIiMFW8AFwzwKSi21kaBOgTy+c6jbCzJkoY=; b=ulsHALIFE2UlvjYw8NANKyhCQNNvVDRalO7v0IXok0RK0+/C9UEfrh2anCR4Zouxcj n0w9ZNx/J5H8Ty5Z//6w2nuZUgS4+bLZqOmDjh/gC+pTtHjrKKQS5lkwd4HX7tJ/3GjE kJxNX8KY0bGL/k5uqBEOgLyvu10GIgPJ+tu0bzYUcDIhhR9cVX0Zpx0ByQiClvCEyyvz +kVkHzBiR4kAwfmdnDct1330x8S1j2hlp+wkJ3Kai047c7Z0tiYTrUw3OzdCEEi30i84 cQjGwIWGQvxUGn/kF/b5hpga57L+Pw0FThO/9TyItOAcLyn+mdYoX4h1fWPZ9Kk/0+xt r3/g== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com Return-Path: Received: from david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id a12si405653wmg.4.2018.02.11.23.44.29 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 11 Feb 2018 23:44:29 -0800 (PST) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.14 as permitted sender) client-ip=192.35.17.14; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com Received: from mail3.siemens.de (mail3.siemens.de [139.25.208.14]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id w1C7iSl0019352 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 12 Feb 2018 08:44:28 +0100 Received: from [167.87.31.168] ([167.87.31.168]) by mail3.siemens.de (8.15.2/8.15.2) with ESMTP id w1C7iRNg015222; Mon, 12 Feb 2018 08:44:28 +0100 Subject: Re: [PATCH v2] meta/classes/base: Fix showdata and liststasks after bitbake update To: Alexander Smirnov , isar-users@googlegroups.com Cc: Claudius Heine References: <20180209172850.28852-1-asmirnov@ilbers.de> From: Jan Kiszka Message-ID: Date: Mon, 12 Feb 2018 08:44:27 +0100 User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 MIME-Version: 1.0 In-Reply-To: <20180209172850.28852-1-asmirnov@ilbers.de> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: VaBimwjYNGdl On 2018-02-09 18:28, Alexander Smirnov wrote: > 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}" > Looks good to me, and it also fixes the broken indention of those tasks, something bitbake started to complain here after enabling signatures. Please merge to next. Jan