From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7075595997826514944 X-Received: by 2002:a7b:c199:0:b0:394:26d0:a6a9 with SMTP id y25-20020a7bc199000000b0039426d0a6a9mr5253632wmi.116.1651761593928; Thu, 05 May 2022 07:39:53 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6000:1688:b0:20c:67b9:e68b with SMTP id y8-20020a056000168800b0020c67b9e68bls1919406wrd.3.gmail; Thu, 05 May 2022 07:39:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwaTCq9lISsQOHNFkabEHTlb3raBP/0DY2J51Y1bTkP/QSxSUHV7QAiNTUGzv1jFHlnn57Y X-Received: by 2002:adf:e5cd:0:b0:20a:f3d9:3376 with SMTP id a13-20020adfe5cd000000b0020af3d93376mr20838633wrn.228.1651761592989; Thu, 05 May 2022 07:39:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651761592; cv=none; d=google.com; s=arc-20160816; b=il6gro+AGgrE/rA2uM3zkv6Pl5LdMOQqN+odkJyVFSNU+Cs43RscLCPo9PO1oxlRYM uCUOxwE7CSIHnil5CHz0aFVpx6pg37x97v2LpwyoO/eKkXlHnyw4E4XFRY9P/HNfMsUc Fz/by6me3cjzEsba3W6IlTOaycBGGOtxVAoh8BpZEYZGZ69O3pmHlMgWKEZLJwUf1P2P OFANyzvvHnj3B2sWahPgmvp0XLS8EXcpsgWUpZoeUozOZq/8pjqJcdbSdNGpHchM+XoM KNRH074TqXiuh/dLMqFD99Ze2ilZkSMJCuKbvftH/jIU9Mbxy5au7UxJcD9Y8oL7sezA WEMw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from; bh=RyAjFz5JBIqQTbcH2a5pfQM0diSQRCHq93WXXosK45w=; b=ih3zH5xFjBdnzgsvbq/91IVhfoCJDQFIQW32lzIC61Ski1igvHLlUREbbVl7dguU7X f6CJ6ybplXdPxyC1nJ3E9NgTNKWBBfpmHwj/uOYviwTd95UXeFiUeKMYVK4uLV6OXGAG LimBpCHH18ONNy/WcMQyvJnGzhb7+QeArpUEDuDBhhayBlIvES6B1DSWyC9ghDZUWP+g VqCaEJeMtZVFldjYgSbLRHDCrrrxzn25CBj5NsUj5MNOjbYYB9D8aNB0gfH1xLYjq4+8 W7ZmP0wOiyE8G0huOmJCh91lBP4oGwZF4PtZrxUibWzZ9/v9tynkKIwGaxrQGzKxFv6r sY6g== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id n23-20020a05600c3b9700b003943e39b255si40248wms.0.2022.05.05.07.39.52 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 05 May 2022 07:39:52 -0700 (PDT) Received-SPF: pass (google.com: domain of amikan@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 amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Received: from localhost.localdomain (mm-0-74-214-37.mgts.dynamic.pppoe.byfly.by [37.214.74.0] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 245Edf7b014026 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 5 May 2022 16:39:52 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: adriaan.schmidt@siemens.com, Uladzimir Bely Subject: [PATCH v10 09/19] sbuild: Add ccache support Date: Thu, 5 May 2022 17:39:24 +0300 Message-Id: <20220505143934.16096-10-amikan@ilbers.de> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220505143934.16096-1-amikan@ilbers.de> References: <20220505143934.16096-1-amikan@ilbers.de> 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: Z5Z5dW/6G9km From: Uladzimir Bely 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 | 23 +++++++++++++++++++ .../sbuild-chroot/sbuild-chroot.inc | 1 + 3 files changed, 28 insertions(+) diff --git a/meta/classes/dpkg.bbclass b/meta/classes/dpkg.bbclass index 3c7b670..d92135c 100644 --- a/meta/classes/dpkg.bbclass +++ b/meta/classes/dpkg.bbclass @@ -48,6 +48,10 @@ dpkg_runbuild() { deb_dir="/var/cache/apt/archives" ext_deb_dir="${PP}/rootfs/${deb_dir}" + if [ ${USE_CCACHE} -eq 1 ]; then + schroot_configure_ccache + fi + profiles="${@ isar_deb_build_profiles(d)}" if [ ! -z "$profiles" ]; then profiles=$(echo --profiles="$profiles" | sed -e 's/ \+/,/g') diff --git a/meta/classes/sbuild.bbclass b/meta/classes/sbuild.bbclass index 178ba1b..6ff41dd 100644 --- a/meta/classes/sbuild.bbclass +++ b/meta/classes/sbuild.bbclass @@ -105,3 +105,26 @@ remove_mounts() { done EOSUDO } + +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} + + (flock 9 + [ -w ${CCACHE_DIR}/sbuild-setup ] || cat << END > ${CCACHE_DIR}/sbuild-setup +#!/bin/sh +export PATH="\$PATH_PREPEND:\$PATH" +exec "\$@" +END + chmod a+rx ${CCACHE_DIR}/sbuild-setup + ) 9>"${CCACHE_DIR}/sbuild-setup.lock" + + 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 177a8a6..74811e2 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.17.1