From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7032253102499561472 X-Received: by 2002:a2e:8753:: with SMTP id q19mr49419013ljj.375.1638968753294; Wed, 08 Dec 2021 05:05:53 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:3d9e:: with SMTP id k30ls1237714lfv.1.gmail; Wed, 08 Dec 2021 05:05:52 -0800 (PST) X-Google-Smtp-Source: ABdhPJwGVktEksQHvafUKN9L6h0XXPGibcSjanDtsNzAqOpe2U6j+RjMT92hSjTMHdzhe8EVKAin X-Received: by 2002:a05:6512:6c3:: with SMTP id u3mr16190409lff.607.1638968752273; Wed, 08 Dec 2021 05:05:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1638968752; cv=none; d=google.com; s=arc-20160816; b=wsgZ+OumZlsDN5W1z5gWoNKGRIrOReI8AinySIBeuZokirSjQQ/6UzAPUdaQkpDEEJ onUVgy1oP9vJIu4pt/Hz6V6GQrOze1Fl1gayicXx2j0T6B3dDIqV9RlKx2cUB6AdNYv/ 8trDCOZM/9lhP4XAzBIUVd05QT4w/fjKqkIv7gHCj0mtiyu4tWgqYNJCAu35XvzvmKPy tklICSdUwWja9ySd6Vw8DoMAmEx1ekIMZg9Epigx0K7VfTLl4ULYeOgQIoS+vXio/AGF vY5IxzJkJk5xnquQAPBiNZnvfj5KBFTcSI8HPnuUD/l7oeIM81vH7fmfDqftyqknwRSu 3F6w== 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=yAGYryoOoziTGj0AJXVdvATpOEMljLmvOAWRntVBNu0=; b=NPBj3Aj+eAGssg3gxWwehnK6+bBZ26vXssR0Vw9sSCxj2l2QJciJ918mNiPbDIA8qr r+cAMoGirNa1SLT2MYL8EsA74NAu5QP6BrKFMs7Ca1s9AOeDkWDgctrdjQdsKFLUqxQ2 qpJO3f1kxN9IHKnZPgn9l9k9qktB7QqNk93/0qrb2Xo7OVo88J8hgv8W+iPFFKWLD7Tb +NX9D3KLRiNz0ul6yG885s76cFb6so06eo0FzipbSjKE/FTW1eCsVHJ0hPCefXMGuHPO VHdWBu2VlUX3NRc5sWh0NaB1iv7mKJKGDOksS1pYHK2q+/P77DoLxM9Jx0aJ7rlMmYGO COiQ== 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 c12si188009ljf.4.2021.12.08.05.05.52 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 08 Dec 2021 05:05:52 -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 1B8D5iLL009193 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 8 Dec 2021 14:05:51 +0100 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v3 20/20] sbuild: add ccache support Date: Wed, 8 Dec 2021 14:05:44 +0100 Message-Id: <20211208130544.15133-21-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20211208130544.15133-1-ubely@ilbers.de> References: <20211208130544.15133-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: M41LRw8TfMwb 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 85bb1300..e68605ef 100644 --- a/meta/classes/dpkg.bbclass +++ b/meta/classes/dpkg.bbclass @@ -27,6 +27,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 + sbuild -A -n -c ${SBUILD_CHROOT} --extra-repository="${ISAR_APT_REPO}" \ --host=${PACKAGE_ARCH} --build=${SBUILD_HOST_ARCH} \ --starting-build-commands="runuser -u ${SCHROOT_USER} -- sh -c \"${SBUILD_PREBUILD:-:}\"" \ diff --git a/meta/classes/sbuild.bbclass b/meta/classes/sbuild.bbclass index 0df8cb90..54ae8550 100644 --- a/meta/classes/sbuild.bbclass +++ b/meta/classes/sbuild.bbclass @@ -160,3 +160,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 7b41d11d..4688da1d 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 \ devscripts \ equivs \ " -- 2.20.1