From patchwork Fri Jan 27 00:54:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pedro.miguel.baptista@gmail.com X-Patchwork-Id: 18717 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id E6148C61D97 for ; Fri, 27 Jan 2023 00:55:26 +0000 (UTC) Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) by mx.groups.io with SMTP id smtpd.web10.91824.1674780917497698391 for ; Thu, 26 Jan 2023 16:55:17 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=F9QHubxb; spf=pass (domain: gmail.com, ip: 209.85.128.53, mailfrom: pedro.miguel.baptista@gmail.com) Received: by mail-wm1-f53.google.com with SMTP id c10-20020a05600c0a4a00b003db0636ff84so2399470wmq.0 for ; Thu, 26 Jan 2023 16:55:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=3yZBijbuqbPdPBcHIxqV8tY9rlRcTZQ9aVRSZBaebhw=; b=F9QHubxbKFxiACjk18iKa9iFfQ20JDMzPx3oDr3Ghvk9y1cwY1vlC2LMcEG/q4/wVF s6JzL4kRvbnKfVt1n0+ZEZy1rGVnuzJ4eaOK7k1VvlopuL0kghUbLhZHiKaE5l+KnpmT qnMmLKm3RGR2PuoUiz9UL2jkZbh0H22AE1rS0CQkBw9+vM6XNwdZaKC6sX1HUo4ZUNHW OJTcK09GrelB7RBRPV1Ex9uAINzb1XhNvSuUm0j314k17NrF6nqlcS824diKaBgFNT4M tP44av5+X1Qd9ok1b6SksNQf5QOZM/iEOOd09uK80C3JV/K61onSfhQ1BxAMagJZrhHI Cq0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=3yZBijbuqbPdPBcHIxqV8tY9rlRcTZQ9aVRSZBaebhw=; b=pmAdNJyrnJpjV9y3ofthU0mSHFVja6/TaD9lVvnllk0WV0X7uVJ67j0qaoigiaNMk7 l4VJXbmdMH2JEqRJj8HajwjqjBMfmm8v81aIWWwyhJx/sNHgj4UR0xJ9oL146oEJEYBV 7kYzwGg0ArWOe5ijYVlGUyIGk/gnZrWlreZWv8tW2vg2XJwaqQkju0tAGEAO6hVTBctN WH74HhRA1fV2QIs2ubS13q4l7exMTsF8S3oHPTHRdGuUAtweOCC+sQEc5rCapD+0SaI3 lt3fNblp8aOrZAOOs6isv/BUuB6XpkWPBEzp9UxymhZf2zbtXut2pz5r4rAlSuBryIHz X/ZA== X-Gm-Message-State: AFqh2kq74EzMrjQyPBGNukPsTglr0AxPKAkZtngaxVJ021DGqpyFTIuG nCkpor/X7DFHKHtbB9FYFpCGMwzz2Rc= X-Google-Smtp-Source: AMrXdXvmUmO+DnV5+NKzkHw0+183FdqGMDSJX0fTwwDYEYZlk4o11Po/8o9GaPlMN8hn0IYMVqSv9Q== X-Received: by 2002:a05:600c:a4d:b0:3db:1d6:16f7 with SMTP id c13-20020a05600c0a4d00b003db01d616f7mr34951771wmq.23.1674780915640; Thu, 26 Jan 2023 16:55:15 -0800 (PST) Received: from CTW-01843.criticaltechworks.com ([88.157.222.244]) by smtp.gmail.com with ESMTPSA id e38-20020a05600c4ba600b003db11dfc687sm2744576wmp.36.2023.01.26.16.55.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Jan 2023 16:55:15 -0800 (PST) From: pedro.miguel.baptista@gmail.com To: bitbake-devel@lists.openembedded.org Cc: Pedro Baptista Subject: [PATCH 1/2] query.py: Replace layer directory name with layer name for show-layers Date: Fri, 27 Jan 2023 00:54:56 +0000 Message-Id: <20230127005457.48733-1-pedro.miguel.baptista@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 27 Jan 2023 00:55:26 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/14356 From: Pedro Baptista Replace the layer directory name with the name from BBFILE_COLLECTIONS which is useful when assigning a LAYERDEPENDS value Signed-off-by: Pedro Baptista --- lib/bblayers/query.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/bblayers/query.py b/lib/bblayers/query.py index afd39518..4c071326 100644 --- a/lib/bblayers/query.py +++ b/lib/bblayers/query.py @@ -33,8 +33,8 @@ class QueryPlugin(LayerPlugin): logger.plain('=' * 74) for layer, _, regex, pri in self.tinfoil.cooker.bbfile_config_priorities: layerdir = self.bbfile_collections.get(layer, None) - layername = self.get_layer_name(layerdir) - logger.plain("%s %s %d" % (layername.ljust(20), layerdir.ljust(40), pri)) + layername = layer + logger.plain("%s %s %d" % (layername.ljust(20), layerdir.ljust(0), pri)) def version_str(self, pe, pv, pr = None): verstr = "%s" % pv From patchwork Fri Jan 27 00:54:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pedro.miguel.baptista@gmail.com X-Patchwork-Id: 18716 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id E611EC54EAA for ; Fri, 27 Jan 2023 00:55:26 +0000 (UTC) Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by mx.groups.io with SMTP id smtpd.web10.91829.1674780923381493196 for ; Thu, 26 Jan 2023 16:55:23 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=V/LnYqrD; spf=pass (domain: gmail.com, ip: 209.85.128.52, mailfrom: pedro.miguel.baptista@gmail.com) Received: by mail-wm1-f52.google.com with SMTP id j17so2439447wms.0 for ; Thu, 26 Jan 2023 16:55:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=p3U21yLFUtDtRCsasq2BmP4s2AVivrRgPKDrlIGOJjg=; b=V/LnYqrD+oaTWCUWH8lBA1v6PknOos103vCMqo9sJrZmJwk9cGCKlqm0HClCpn1Ext UmlV9AoTaI2UpBEhRRMd8mBzjfGtvEA1OGbuAvpbW5NzzulmDC0aPtAhMmkBzzipuiPd 8oBuHqu7Dh8yLa732CmWb/c9rboHHJzLKOFwNoJ0GDo42VhBTCUy/YIksa7ABkpLM9Hi kyymqW+HyPbHn7pjgBnBDSu+wlW8mLk/QSdGkSW+kF7m7dv/7A87Cgl1qbmfhyWRSiof 42XKiXnOO15N45v+F5P7ZjJ9r9TiSwDQJx5q/lmVPz2Y4HcBFwjjeG8l/L+judSbGl9h H5Wg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=p3U21yLFUtDtRCsasq2BmP4s2AVivrRgPKDrlIGOJjg=; b=Hlw1f2K6lSETz8HzQfqOA/wm7i4dq2f4zs8+TxlR0qdmi5imZSVPBN/eqGxf0k9C3i nZe/0DA4yQbRP546CMoBLZKsRRF2i/YdEos0G+AZsSYHH2BR6t8PiJJen6aKsPDZdjgr TyzI3hkaZO4Oj3nEW8JXa1OQBLoqbuddyCSyXU4cMVthdl+S0uQFwBIsklBY/XaOnf3V 0RUrLpzcXAqr/qQn3rlrUPvPbdL24ceWyEX6tbRHYI/2/XoU1nuKlH6dMTx7V1nTgFyM lYXNIfVIr+WF00v++kZBsqZtWW4s+37LYlir0CpBfdJkowPUX2BInmF/wG8Q7viP/6Ht 2mpw== X-Gm-Message-State: AFqh2kphtBCQRHvlDfcAoGfFP92pgFuQ2Q9BaT0vsfEW7F00YFAcFu58 f1PnDjdDo2ra5zRcCOY/7dTVn1ovPyc= X-Google-Smtp-Source: AMrXdXsCpuiAYo0WQpE/rHaW+XscSlNOVW+9hRvbWDAorozwUVBk31C0lSf63PBAQJ9FKDJ1PpZxYQ== X-Received: by 2002:a05:600c:4395:b0:3da:2829:2935 with SMTP id e21-20020a05600c439500b003da28292935mr37407403wmn.11.1674780921648; Thu, 26 Jan 2023 16:55:21 -0800 (PST) Received: from CTW-01843.criticaltechworks.com ([88.157.222.244]) by smtp.gmail.com with ESMTPSA id e38-20020a05600c4ba600b003db11dfc687sm2744576wmp.36.2023.01.26.16.55.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Jan 2023 16:55:21 -0800 (PST) From: pedro.miguel.baptista@gmail.com To: bitbake-devel@lists.openembedded.org Cc: Pedro Baptista Subject: [PATCH 2/2] query.py: Adjust show-layers output layout Date: Fri, 27 Jan 2023 00:54:57 +0000 Message-Id: <20230127005457.48733-2-pedro.miguel.baptista@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230127005457.48733-1-pedro.miguel.baptista@gmail.com> References: <20230127005457.48733-1-pedro.miguel.baptista@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 27 Jan 2023 00:55:26 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/14357 From: Pedro Baptista Increase the `ljust` value for each column in show-layers output. This improves readability when long layer paths are included Signed-off-by: Pedro Baptista --- lib/bblayers/query.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/bblayers/query.py b/lib/bblayers/query.py index 4c071326..bec76db9 100644 --- a/lib/bblayers/query.py +++ b/lib/bblayers/query.py @@ -29,12 +29,12 @@ class QueryPlugin(LayerPlugin): def do_show_layers(self, args): """show current configured layers.""" - logger.plain("%s %s %s" % ("layer".ljust(20), "path".ljust(40), "priority")) - logger.plain('=' * 74) + logger.plain("%s %s %s" % ("layer".ljust(20), "path".ljust(70), "priority")) + logger.plain('=' * 104) for layer, _, regex, pri in self.tinfoil.cooker.bbfile_config_priorities: layerdir = self.bbfile_collections.get(layer, None) layername = layer - logger.plain("%s %s %d" % (layername.ljust(20), layerdir.ljust(0), pri)) + logger.plain("%s %s %s" % (layername.ljust(20), layerdir.ljust(70), pri)) def version_str(self, pe, pv, pr = None): verstr = "%s" % pv