From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7037496833474560000 X-Received: by 2002:ac2:4d8d:: with SMTP id g13mr18189509lfe.49.1638544917750; Fri, 03 Dec 2021 07:21:57 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:8611:: with SMTP id a17ls1679670lji.1.gmail; Fri, 03 Dec 2021 07:21:55 -0800 (PST) X-Google-Smtp-Source: ABdhPJzXw18GKWfd+Tshf1HhTCAyREqwemRtFWVtKo2xQPGngkiwRgJl2Kqrk/fu2j3zC0KAsRmA X-Received: by 2002:a2e:9718:: with SMTP id r24mr18816895lji.406.1638544915148; Fri, 03 Dec 2021 07:21:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1638544915; cv=none; d=google.com; s=arc-20160816; b=XgyvLQQABRwIUTN7Gxtflj28E4t4Y0U/UiprKVZGElDQZ05ppkqMNBAnIPrHHsdLRV HwHJmslgOuKP2ECcebZmzgOOufVIVxz4tI5vUBqlIn0JgnLH7ehI2XLhXktCoc4+LgMQ K3Mq8/kaksgQhsIZIQ5+LLZogOMPDjHqvRDAVXsSj+LhBDlSdKZlBJQNyqk0gyVoZJrE wnocQNcBRjAwRNWmN060vS+WeeTOkzgRdZ7pOQoW00AVd6TqSHeHDOjjtkFCNsFS4wxt 7plBJcilTxt4QRcbob1wIk70acO5SoVpwuPUynm6x4F9seG4/B4iBX+BSCADSqD5sz+W C8cQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from; bh=RLpi5w7lcBoGFxyAnNRFxNgNOIbe6nVJspzhgxfytV8=; b=YgcTXpzL3lENHVZaseMhLhTibFEU1cDTDGla0HmmV3SBeUFTzqOZjCmQAbADfKRkVN udEulPSjQkGB+EaEwIQA51+YWhOLrk0jwdX8DCZ6qLrogxL1zdyL7AkLtf/LMDRaDGdv /bZrQg9JAvq6UbH0vxwOepNoJKeAoDrvd+eVHBhadM7wBCyCT5cIquMh7KpHJhNWYQF0 TzT+oary4DpV0IhQ0YhDlMmLxe8hGolqOrnX99tPwCZBlztJudVQRGVvQCFQuyuiAUWx BP/br/I8CyxgrqagtEV79QCI87DUuR6pE7FNwM+zOjPyfmOOUq2NgPxJFHmvkodDiRcd YTVA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of felix.moessbauer@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=felix.moessbauer@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id i16si224289lfv.2.2021.12.03.07.21.54 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 03 Dec 2021 07:21:54 -0800 (PST) Received-SPF: pass (google.com: domain of felix.moessbauer@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 felix.moessbauer@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=felix.moessbauer@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id 1B3FLs35025897 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Fri, 3 Dec 2021 16:21:54 +0100 Received: from MD1T0KAC-VM.ad001.siemens.net (md1t0kac.ad001.siemens.net [139.25.68.224]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id 1B3FLsMH016062; Fri, 3 Dec 2021 16:21:54 +0100 From: Felix Moessbauer To: isar-users@googlegroups.com Cc: jan.kiszka@siemens.com, adriaan.schmidt@siemens.com, Felix Moessbauer Subject: [PATCH 1/2] Setup ccache in devshell as well Date: Fri, 3 Dec 2021 16:21:35 +0100 Message-Id: <20211203152136.3260090-1-felix.moessbauer@siemens.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: /g3bR0pJTehY This patch also enables the ccache in the devshell for recipes that use the ccache. By that, also ccache statistics can be inspected. Signed-off-by: Felix Moessbauer --- meta/classes/base.bbclass | 5 +++++ meta/classes/dpkg-base.bbclass | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index c43ec19..d8347b9 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -166,6 +166,11 @@ def isar_export_proxies(d): return bb.utils.export_proxies(d) +def isar_export_ccache(d): + if d.getVar('USE_CCACHE') == '1': + os.environ['CCACHE_DIR'] = '/ccache' + os.environ['PATH_PREPEND'] = '/usr/lib/ccache' + do_fetch[dirs] = "${DL_DIR}" do_fetch[file-checksums] = "${@bb.fetch.get_checksum_file_list(d)}" do_fetch[vardeps] += "SRCREV" diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass index 6704385..cb5ce4a 100644 --- a/meta/classes/dpkg-base.bbclass +++ b/meta/classes/dpkg-base.bbclass @@ -278,10 +278,12 @@ python do_devshell() { bb.build.exec_func('dpkg_do_mounts', d) isar_export_proxies(d) + isar_export_ccache(d) buildchroot = d.getVar('BUILDCHROOT_DIR') pp_pps = os.path.join(d.getVar('PP'), d.getVar('PPS')) - termcmd = "sudo -E chroot {0} sh -c 'cd {1}; $SHELL -i'" + # the PATH variable is not forwarded by sudo -E. + termcmd = "sudo -E chroot {0} sh -c 'cd {1}; export PATH=$PATH_PREPEND:$PATH; $SHELL -i'" oe_terminal(termcmd.format(buildchroot, pp_pps), "Isar devshell", d) bb.build.exec_func('dpkg_undo_mounts', d) -- 2.30.2