From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7323090965331181568 X-Received: by 2002:a05:600c:474a:b0:40e:4557:53ce with SMTP id w10-20020a05600c474a00b0040e455753cemr411957wmo.39.1705039982207; 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-Google-Smtp-Source: AGHT+IHu3HIKwEoae6NJT3p+7luLbqYFN8NdUXxuWyAQVdn0zhLYxcG9EcxqXrciXU8hiwgOds09 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 Return-Path: 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; 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 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 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED 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-TUID: uheI+LVw3PHK 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: -- 2.20.1