From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7057122428766388224 X-Received: by 2002:adf:ce8e:: with SMTP id r14mr4130686wrn.244.1644475585305; Wed, 09 Feb 2022 22:46:25 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:8bda:: with SMTP id w26ls49767wra.1.gmail; Wed, 09 Feb 2022 22:46:24 -0800 (PST) X-Google-Smtp-Source: ABdhPJwoFJXKnInqm05lTGQu0RFHGG5dtW5BWHd87lKqCBlXK1HpjOrfW50IZ+YDsa/89VXWHjFT X-Received: by 2002:a5d:4882:: with SMTP id g2mr5210367wrq.393.1644475584373; Wed, 09 Feb 2022 22:46:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644475584; cv=none; d=google.com; s=arc-20160816; b=Uo4YopAnmmIPJ3u+yMGYiA7BSvGRhFhRNyfjwlaLJcpHmBcPPbh1OuKwt7O2C1Qm8S gmMgzV6vBUcbTxbjlpAWyyGvRLsxn+UPHgv7CWKOA2Iu7pwfrVAB0qBp93ctmVCr5BH9 PXWQTZdhnNjXqcIGCq5RzotQObEomgqhTQJns7LkmJU1003fpfHrq20f7R4rbGSe5nv8 bolOCu+hHocxxjNRZev0HrKLokeOsBXVsiPcMnwGx9rOxEm37JHuY86kUjXNI5KnzXic sbB/wXnH2vQcJTt5l/5rqYtP509Oedh225uMgmO4veIGJ+IEOeAyD0wM5VuvWQ5UDcdO CfWQ== 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=EuVRKtwdKCcKp+blXh2bOfDMjGqz1uJf9f90pe8ao20=; b=hwmVSbbgZPt+kQKv6wPwlxtFIID4HhSNNyfGpCrM7OsINWpqJrD2uBWeDB7vAswspP dpLXQ6cslfFC+7E+Zh1LoXe1RDIl1Ph4jOZlak3GC2/NadL3TrxnXqWiJkbLzZXXei+M M4c67FFZzn6MTqaOn+gT0NtVZJ2k3qgTVnfGO0jcp2JcGJlzxSaEV3u+VxpzWmU4jXGp Tp+d8zWEzs8b49ZDV0WgFjNQkVe4UHFkCPUgvLF14QqsZ9kWujCUs1gN+4YGMpZTqvY5 boFOie5ubGmR9CQMLdUITy9tRwcpX3yohThG7rUGLQaLnBkbMXRWQCCorLsHbL/H+RqU BGIg== 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 az22si837368wrb.5.2022.02.09.22.46.24 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 09 Feb 2022 22:46:24 -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 21A6kKrB028169 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 10 Feb 2022 07:46:23 +0100 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v6 09/12] sbuild: add ccache support Date: Thu, 10 Feb 2022 07:46:17 +0100 Message-Id: <20220210064620.4392-10-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220210064620.4392-1-ubely@ilbers.de> References: <20220210064620.4392-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: G/NJeM6m+Q3D 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 | 21 +++++++++++++++++++ .../sbuild-chroot/sbuild-chroot.inc | 1 + 3 files changed, 26 insertions(+) diff --git a/meta/classes/dpkg.bbclass b/meta/classes/dpkg.bbclass index 4cf405ad..3cd40ba8 100644 --- a/meta/classes/dpkg.bbclass +++ b/meta/classes/dpkg.bbclass @@ -55,6 +55,10 @@ dpkg_runbuild() { echo '$apt_keep_downloaded_packages = 1;' >> ${SCHROOT_USER_HOME}/.sbuildrc ) 9>"${TMPDIR}/sbuildrc.lock" + 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 6fff664f..9896b772 100644 --- a/meta/classes/sbuild.bbclass +++ b/meta/classes/sbuild.bbclass @@ -158,3 +158,24 @@ 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 PATH="\$PATH_PREPEND:\$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