From patchwork Fri Jan 12 06:12:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Uladzimir Bely X-Patchwork-Id: 3279 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Fri, 12 Jan 2024 07:13:09 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-lf1-f56.google.com (mail-lf1-f56.google.com [209.85.167.56]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 40C6D9aT005435 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 12 Jan 2024 07:13:09 +0100 Received: by mail-lf1-f56.google.com with SMTP id 2adb3069b0e04-50e93545a26sf1052411e87.0 for ; Thu, 11 Jan 2024 22:13:09 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1705039983; cv=pass; d=google.com; s=arc-20160816; b=pfeWgcAxQApJyADaNgPG+PGMTt/4YPSXWgny44mW+k04ePgdaW1e/Kn+NFhCOeT3qN SMYzb+98p/MPpaaJ6E4ueJNg8fBntMtGTwFeV+srmP2cQ3zVyZBeWp7UIlxdNVL/m/eD hp6Cj4gIvHjo4jtFxzZkmG2hIN5fj7pWwfU1ZY3YfEDhWy0OoAbG3VTEwLOWd5gdKW/M P3ULlRrbp3gtGKDUTjouZMkXkaBA/1088jXfhfhXt52787KL8it2Vz0DkxLH+8RI+VPu n2MK0qIdcazUgJ8BOQNHMVxdafscAsvw04jKnJFO0Aw1CFWAI7bGUHoxqeMjPagRYVgv pjcA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:to:from:sender:dkim-signature; bh=zk+1YNSKzDxM7/zD6s4sMqpKD5qt9hPkvJpdyGBDxN8=; fh=7tclEdh7YbwSQowgJ6LNq720O7H5HTEaqj22NJWRE2E=; b=dQueLWg4FJf5UHqw91h2EELdlfZQIgtwhRpRS79lksN8mLiMjP9W35W9qW+skoUbuV b/pAmgm5zIX3BkywJCYOaomtXPgRFnWzn3YW8Pu6mPphE4fGbjNlGXdw1IQBqzOaDJkU mQwnZdH0+T1SEMurFrBjotIE0asuEn8zJn2Zx0ynVGnUehUYlYU1/fOaGnQEXlJVJE+y T0oYhY2/UiqLh9PvrHURKYHdnK5oZOalHl8a5twOQDYNqMlQzbRMEswodEudnDE5TmPW PXuk0k675ngRWEBF9joEnKLMYedt6dRM6nmNREOEz6svXgPWX2T29YdAzK3NKC9pdG0Q 2MCg== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1705039983; x=1705644783; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:to:from:sender:from:to:cc:subject:date:message-id :reply-to; bh=zk+1YNSKzDxM7/zD6s4sMqpKD5qt9hPkvJpdyGBDxN8=; b=LxnedULjclPkAZ7rOs26o5uXAjb3c3CWDFrNf8XlrrRnGw7gBDp1OCV9Kg+SLDUQX4 2OsSGhHzjRm+PMqe7oGVzzmm35DGkZ6DtmLAyDVr5FBPJxxqHAjVjYVcazBraeRG7f/N guAOJUgMqq3wPOJn4plvHFxpVRd2zfoLROIegoOKXocgR90DntrsBvapeBUossivGM4S oNbAuTmnr7PsMgJhAA6gwe1wODe6iSnwm4oIUlZ/Bfc1Zdlkm+4susvv/pIB7yZas/yN AkIlZ+cIC9i9J0EVVhKbbpkf8OVISxdITFHhoYJtIpk59woZL+cjxyJlvBCpP8t9boga 5OIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705039983; x=1705644783; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:to:from:x-beenthere :x-gm-message-state:sender:from:to:cc:subject:date:message-id :reply-to; bh=zk+1YNSKzDxM7/zD6s4sMqpKD5qt9hPkvJpdyGBDxN8=; b=UluKW6Y/zuEGgdwJGkF4IP9zDroKO84eWpizUHjpaYqXh5gsZExIcf7hiM+VKiOyBK zCEqz6Bvk0xbVMZZ/wltEUJtsgGYW1VoY3cWCJmk64cJWggftflDaVibNZ1eBSQHAuIw fE5pm6/HJwqD/oDU49K/PHgv1HrUplQLTfcfcZNqvaZc8RmGO9u8fLr99m+eYDnzys0/ txjZD3Dgg0Cp1ex6okbeCOmfxcvkJyNbFVh6mtpzv0wca3M+n1bej9Yj0MFBvs7QIjZs NdqE9lYO4I00BAHOKN+k92zjq0NmDxHKeXWoY3WOFPwPrNjfco+27tXUVT70aX9b/6iO OaMQ== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOJu0YyOPHT5vFzRitlATh8m+nXhqH6zLq/ix0xlXwV/v70pt/Ai4Zvk fdH32J/pNF/k5B9xBZ71bug= X-Google-Smtp-Source: AGHT+IGb5XHgDt1nToZsABD9Tj6LHl/B3/Ng3Lv+LL6nkb5Cbquyi1ro2VGVjSzyonHYy5zjaCEA+w== X-Received: by 2002:a2e:4e1a:0:b0:2cd:3731:9c53 with SMTP id c26-20020a2e4e1a000000b002cd37319c53mr411110ljb.4.1705039982115; Thu, 11 Jan 2024 22:13:02 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:2259:b0:40e:4318:8432 with SMTP id a25-20020a05600c225900b0040e43188432ls1778514wmm.2.-pod-prod-00-eu; Thu, 11 Jan 2024 22:13:00 -0800 (PST) X-Received: by 2002:a05:600c:3ca5:b0:40e:574f:b6d5 with SMTP id bg37-20020a05600c3ca500b0040e574fb6d5mr479952wmb.2.1705039980011; Thu, 11 Jan 2024 22:13:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1705039979; cv=none; d=google.com; s=arc-20160816; b=M5CGRb1Gcf35ztO9hR6WsgsoHLetiK9SbP3/Ygpk2KnP2OS+fCUrXEH/t3m6jeJv0z G6wqTAUBU/CXWVhu9b7URxRehwh863iA6OgDtn8y7sNPY6VqM99nKS5rCTfQWH387ZXt zhYAucTGnHrY2lGVxTueB3zVWd5n55wFnQjieZ9oKPc7A4w8MRfwwVsOy/rjIWU1CfZU UAmKcE/W25iQqNym1/MsyyVwfHwWQqJHZRHW3UTWgTubUJ93TrHmNvaf1PRH5ANR7eIU BckdCQYMnLqC/kx6y/HZ/moaT6vac8FNM1pmHRu1jYeuPVZxk06pWD04ytz2kTgbS+XV T3pw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from; bh=+TKe20jThWWtcQvckF0l4/B+3M5CXnT5D5S1s/FJMmY=; fh=7tclEdh7YbwSQowgJ6LNq720O7H5HTEaqj22NJWRE2E=; b=Oddat/k0Ibf4w+qZCBcMDr/Bp197rBy8eyiLB+jyMU12qYzVgSHu63JWhK4HeLoKat I+9khNbI0jHphuTjJx4zyy1/6VBgaz06Ubphl4gBFszbI1nGrBoFd7K9214/3RuiHH1T q/MnH6TSrBabrXfM8ASH+v/awM8llyxUSKQsrq2sJ2nYrhaO0BvlOm/p8+xByjncgJzM f7w+MpZSblEjlqAJbiyXodAVlsbNOSUDuKCsNaIPaUdAkBMVmtAu0i6w0hZZWhBEE3pC SIgNUYduLP/zddapm/brCCUHqfNsI1ZKpXDEi7JpjbaHO9L/1psKd67LdkwoNJgzphu5 tzIQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id ay38-20020a05600c1e2600b0040e4a2a8890si258070wmb.1.2024.01.11.22.12.59 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 11 Jan 2024 22:12:59 -0800 (PST) Received-SPF: pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Received: from baighyz.m.ilbers.de (host-80-81-17-52.static.customer.m-online.net [80.81.17.52]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 40C6CvqU005370 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 12 Jan 2024 07:12:59 +0100 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH 3/5] buildstats: support of custom disk usage command Date: Fri, 12 Jan 2024 07:12:55 +0100 Message-Id: <20240112061257.22241-4-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20240112061257.22241-1-ubely@ilbers.de> References: <20240112061257.22241-1-ubely@ilbers.de> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-Original-Sender: ubely@ilbers.de X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= This helps to make buildstats code usage easier in third-party projects like Isar (https://github.com/ilbers/isar/). In Isar, rootfs is created with 'sudo' privileges and some subpaths like '/proc' may be mounted at build time. So, using "du -sh" on rootfs may produces multiple 'Permission denied' warnings. Customizable disk usage command allows to deal with these issues (e.g., by adding "-x" option or "sudo" can be added). Signed-off-by: Uladzimir Bely --- meta/classes/buildstats.bbclass | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/meta/classes/buildstats.bbclass b/meta/classes/buildstats.bbclass index b417929b..94e48bfc 100644 --- a/meta/classes/buildstats.bbclass +++ b/meta/classes/buildstats.bbclass @@ -8,6 +8,8 @@ BUILDSTATS_BASE = "${TMPDIR}/buildstats/" # ################################################################################ +BUILDSTATS_DISK_USAGE_CMD ??= "du -sh" + def get_buildprocess_cputime(pid): with open("/proc/%d/stat" % pid, "r") as f: fields = f.readline().rstrip().split() @@ -246,7 +248,8 @@ python run_buildstats () { rootfs = d.getVar('IMAGE_ROOTFS') if os.path.isdir(rootfs): try: - rootfs_size = subprocess.check_output(["du", "-sh", rootfs], + rootfs_size = subprocess.check_output( + d.getVar('BUILDSTATS_DISK_USAGE_CMD').split() + [rootfs], stderr=subprocess.STDOUT).decode('utf-8') f.write("Uncompressed Rootfs size: %s" % rootfs_size) except subprocess.CalledProcessError as err: