From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7012617433684901888 X-Received: by 2002:a19:770d:: with SMTP id s13mr19024lfc.243.1632752235057; Mon, 27 Sep 2021 07:17:15 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:3f14:: with SMTP id y20ls286413lfa.1.gmail; Mon, 27 Sep 2021 07:17:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz9KvxPhBSVh/emK0u9Q4CVaRVFiLHO91QQ5UpW3iLUQ/xUuS5XNGNAKVI+KbuIdsTY9MA4 X-Received: by 2002:a05:6512:553:: with SMTP id h19mr37198lfl.7.1632752233934; Mon, 27 Sep 2021 07:17:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632752233; cv=none; d=google.com; s=arc-20160816; b=m9lqfZPDnlFxmC8SW50D62j4pL+m8Usw7D6Qs8hE/Y1nccRWjchmBHXgb4AnDvip6k SQKj6MZBkmVuR+QvqB3ewNbDyHHapfykHnSShwYdqGCPpdcKwAIAXciiUrfXNfaNjx5e 033976CTLJkm/VR/NVoxx6n/m8Aj5rvpmyx4ck+iI+sksf9PvI1NH/aCgcgcQevGweJ2 ceE1Q5UmT9pdeH21mH9TXfWlRkW3KkZLnFyW1RTB+i/RKVLFje06913MJXYl3VC/dP36 +pmHZNBdGDnedHf827Q9S3cAtbSm5r2h8cXXfDkYBVJavg4pX1jkgkGXQ/8p/tFn/o+Y e1nw== 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=uZzrEOZibEW5yR+Efi8P3PinM/TrSw7LMtE+wy0hkII=; b=VqoxxnI4TRE8YAWwbGOcfj+c/+9yiEX+ogjkbGI58xCnOMOZNqpOOQn7ypbThB4VwG PFUQDrbEh476GLx0TeonVyyMlIqbjM0oV3rR7bK8JXYpZa+nfhnZ9wOZWbUXiGHKMMlS lp+LYqoxIdqdzqR6X8zgoajWJvcI6TDdpqdOAYB0FEAFkhHM/P7tY1ILVkI1rAFRpN5g 3R93ZoH23kk6Ad1vPS4ZB/UsR2YRWdpijT9gz25XILBwYp4KWvyUPpGIQ2X/aiQ7/SG0 atOJy3xkiZ9CXrbksh1xxhNMOCueaE3sV29gLdMtrmt68jVSyGwmFp1gnAnD3WNwH2IV OkSg== 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 y20si869053lfb.10.2021.09.27.07.17.13 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 27 Sep 2021 07:17:13 -0700 (PDT) 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) with ESMTPSA id 18REH66F005171 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 27 Sep 2021 16:17:11 +0200 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v2 2/4] buildstats: Fix bbclass to work with ISAR Date: Mon, 27 Sep 2021 16:17:03 +0200 Message-Id: <20210927141705.25386-3-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210927141705.25386-1-ubely@ilbers.de> References: <20210927141705.25386-1-ubely@ilbers.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: 38kMUjKjiLUc 1. rootfs may be empty that causes exception. 2. sudo required to calculate rootfs disk usage. 3. sys.path modification to make meta/lib available. Signed-off-by: Uladzimir Bely --- meta/classes/buildstats.bbclass | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/meta/classes/buildstats.bbclass b/meta/classes/buildstats.bbclass index 0de6052..e2db8f6 100644 --- a/meta/classes/buildstats.bbclass +++ b/meta/classes/buildstats.bbclass @@ -242,9 +242,9 @@ python run_buildstats () { bs = os.path.join(bsdir, "build_stats") with open(bs, "a") as f: rootfs = d.getVar('IMAGE_ROOTFS') - if os.path.isdir(rootfs): + if rootfs and os.path.isdir(rootfs): try: - rootfs_size = subprocess.check_output(["du", "-sh", rootfs], + rootfs_size = subprocess.check_output(["sudo", "du", "-sh", rootfs], stderr=subprocess.STDOUT).decode('utf-8') f.write("Uncompressed Rootfs size: %s" % rootfs_size) except subprocess.CalledProcessError as err: @@ -270,6 +270,9 @@ addhandler run_buildstats run_buildstats[eventmask] = "bb.event.BuildStarted bb.event.BuildCompleted bb.event.HeartbeatEvent bb.build.TaskStarted bb.build.TaskSucceeded bb.build.TaskFailed" python runqueue_stats () { + import sys + oe_lib_path = os.path.join(d.getVar('LAYERDIR_core'), 'lib') + sys.path.insert(0, oe_lib_path) import buildstats from bb import event, runqueue # We should not record any samples before the first task has started, -- 2.20.1