From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7057122428766388224 X-Received: by 2002:a17:906:7003:: with SMTP id n3mr16075497ejj.160.1643114359485; Tue, 25 Jan 2022 04:39:19 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6402:5190:: with SMTP id q16ls7746804edd.3.gmail; Tue, 25 Jan 2022 04:39:18 -0800 (PST) X-Google-Smtp-Source: ABdhPJzbn9mtXTFGZe+gid0zrVih/3PBd3lAmv6gzDOTSNRDCM6xUEDSGrkgLZnlSNHrR7W5MXaA X-Received: by 2002:a50:c388:: with SMTP id h8mr19901298edf.218.1643114358646; Tue, 25 Jan 2022 04:39:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643114358; cv=none; d=google.com; s=arc-20160816; b=rr0wmSeM4KoL/wdrkHvzgb7HVkEh00/IGyRAt/Gn+Ksk3gQbHdmt+nLHs+NJiHJL4M rWabqySHnKS5Hb+BE06MTWE5bLhq/JW4CDivspa5dq7PG/LpD+POVDLrDuf3Yi3LcCHT 23o+ycC+sHsvD+G9bJVVD2HAnr0T9yU71V7RYDxFhvE9IW0zOpuTGXIj53VY7QQEsG8N 6qdIpNLiEeS3M+XSYlB5wNbdeSQwhERIg1B0Fldemrblzl4j6+RTVYgHD4gxnj5t+eaQ d0De5qsIT1ANUKwlv6PA42D+33cPAm9c+vXYUuLQxo4ikQd48UFSGwJ79yGxgFE0ouRP qcrQ== 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=4h8gKSsBvk9BpOgsfX2DMXrzqcv1KOEXSWuD97+WSdk=; b=wrTnRdg1worEiUYpM40g+caJah8WBcvMW9hIvSpzg8i5XsIgKuISyB1g1bGjScCim+ 3zjtN7hUc+tZlUd8QXeRCYWqpDbGR13LQKLCA1e9ZJHSFNPd6Cd/q6I1wzaHpBEzFXZG 8dMxco+LFnjJF2dp5RGst3e8AWB+OEw/PegtCkl5WoiaSCrLoy7Rx5rbWgLbVUvYAD25 /kSjyAOZewbX38V+VyA3N4Xz73tt4+N+GDLs3JcqZ3069bM3NsYgoISmAkNV0pRHLOEI tnQLs+p+ZMKBQmWSAP100GwKXDOIquaC2QyJKdoKIzhr+ugZAZpxafK3yJoxAkXhSVgH oqnw== 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 s15si792620eji.1.2022.01.25.04.39.18 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 25 Jan 2022 04:39:18 -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) with ESMTPSA id 20PCdFmh019254 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 25 Jan 2022 13:39:18 +0100 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v4 07/12] sbuild: add ccache support Date: Tue, 25 Jan 2022 13:39:10 +0100 Message-Id: <20220125123915.1053-8-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220125123915.1053-1-ubely@ilbers.de> References: <20220125123915.1053-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: RUuH8642cYoT This adds ccache support for custom packages in the same manner as it was done previously for buildchroot-based build, by using USE_CCACHE variable in local.conf or per-recipe. Signed-off-by: Uladzimir Bely --- meta/classes/dpkg.bbclass | 4 ++++ meta/classes/sbuild.bbclass | 22 +++++++++++++++++++ .../sbuild-chroot/sbuild-chroot.inc | 1 + 3 files changed, 27 insertions(+) diff --git a/meta/classes/dpkg.bbclass b/meta/classes/dpkg.bbclass index 8647d077..e761078d 100644 --- a/meta/classes/dpkg.bbclass +++ b/meta/classes/dpkg.bbclass @@ -38,6 +38,10 @@ dpkg_runbuild() { schroot_create_configs + if [ ${USE_CCACHE} -eq 1 ]; then + schroot_configure_ccache + fi + profiles=$(grep "DEB_BUILD_PROFILES" ${SBUILD_CONFIG} | tail -n1 | cut -d "'" -f 4) if [ ${ISAR_CROSS_COMPILE} -eq 1 ]; then profiles="${profiles} cross nocheck" diff --git a/meta/classes/sbuild.bbclass b/meta/classes/sbuild.bbclass index e4341a6f..c9676bdf 100644 --- a/meta/classes/sbuild.bbclass +++ b/meta/classes/sbuild.bbclass @@ -158,3 +158,25 @@ schroot_run() { remove_mounts schroot_delete_configs } + +schroot_configure_ccache() { + sudo -s <<'EOSUDO' + set -e + + sbuild_fstab="${SBUILD_CONF_DIR}/fstab" + + install --group=sbuild --mode=2775 -d ${CCACHE_DIR} + fstab_ccachedir="${CCACHE_DIR} /ccache none rw,bind 0 0" + grep -qxF "${fstab_ccachedir}" ${sbuild_fstab} || echo "${fstab_ccachedir}" >> ${sbuild_fstab} + + cat << END > ${CCACHE_DIR}/sbuild-setup +#!/bin/sh +export CCACHE_DIR=/ccache +export PATH="/usr/lib/ccache:\$PATH" +exec "\$@" +END + chmod a+rx ${CCACHE_DIR}/sbuild-setup + + echo "command-prefix=/ccache/sbuild-setup" >> "${SCHROOT_CONF_FILE}" +EOSUDO +} diff --git a/meta/recipes-devtools/sbuild-chroot/sbuild-chroot.inc b/meta/recipes-devtools/sbuild-chroot/sbuild-chroot.inc index 177a8a6d..74811e22 100644 --- a/meta/recipes-devtools/sbuild-chroot/sbuild-chroot.inc +++ b/meta/recipes-devtools/sbuild-chroot/sbuild-chroot.inc @@ -14,6 +14,7 @@ SBUILD_CHROOT_PREINSTALL_COMMON = " \ fakeroot \ build-essential \ debhelper \ + ccache \ " SBUILD_CHROOT_PREINSTALL ?= " \ -- 2.20.1