From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7057122428766388224 X-Received: by 2002:a5d:64aa:: with SMTP id m10mr5376643wrp.82.1644738304793; Sat, 12 Feb 2022 23:45:04 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:a3d0:: with SMTP id m16ls585407wrb.3.gmail; Sat, 12 Feb 2022 23:45:03 -0800 (PST) X-Google-Smtp-Source: ABdhPJz6DmTbXeHyZWEmhHIgd/2pVrCw9eFmE9ckIrfN9+FOk3EOgW8P63llkL41CIAc2nzo08hh X-Received: by 2002:adf:e512:: with SMTP id j18mr7242797wrm.659.1644738303908; Sat, 12 Feb 2022 23:45:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644738303; cv=none; d=google.com; s=arc-20160816; b=t0Qq5gSS2C8ZhLn/xSOF5CnDqNuBRbcsgGmaEukqoFL++l0rx1Ld3qO9QfCrHL8h4K n+PacJ+hdShc/fi9xjel3QmTdQpWbbMQraJoX6noL3StqW+7FCLoAbOkMHu5+K8WT6E/ /vLKAib8P4Qr2+yWgsqIqkoD/OL68IyVA/V3FCjoxb+HFXcO2vvyE4JOMs26y0e9xcAf FZTWrRwrLvxvtMX3pQZeobhUL7Nk/V0/jGM/HesfMML7sN6616rGGungAlYrCgScZL/S W4+c60amZgLGcNkExhdm/N46PC3nXGwzIiJ0cbVmca3tAxp4Q6SZ1lvFMKsP/zuDyxcv WImA== 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=F+hK8Y4fXJlbX6XBTHIgw/fBZDvI4xmFYXpr0ZWKVBzIzlvVhqoqg+Tg2yHnJgyUiQ qd7z1F0+9hOtw0H7JBHcUYda9g1L8qGGI5KxipkUcpc9Gnz1IjRhcuLq8d8DRkKCJOeR W9KSXpbao1QcTVC/gpw+wnd9JbJWmesVmg3HwDazoTZq4x/PnyE42JILVFC5SSyazqo/ sYIX4jWOXLcnbuZvo0Yo9XuEMRkziiuC7r1MaHGSjDavKGsrfSJtvc3l1e7MYAHRCgg2 rSDmgEErh/C+8I2LI8UohjIqOYKLUNdqfzOgW2RSkIqXN9CPU5mfn7QKeMTed0Z52OIZ j5cg== 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 v13si302959wro.0.2022.02.12.23.45.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 12 Feb 2022 23:45:03 -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 21D7j0Bb010453 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Sun, 13 Feb 2022 08:45:03 +0100 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v7 09/13] sbuild: add ccache support Date: Sun, 13 Feb 2022 08:44:55 +0100 Message-Id: <20220213074459.24200-10-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220213074459.24200-1-ubely@ilbers.de> References: <20220213074459.24200-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: dZiwLpRiw4Cj 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