From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7075595997826514944 X-Received: by 2002:ac2:4430:0:b0:448:2e8f:6131 with SMTP id w16-20020ac24430000000b004482e8f6131mr1773456lfl.104.1647492626747; Wed, 16 Mar 2022 21:50:26 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:b05:b0:448:696a:ea62 with SMTP id w5-20020a0565120b0500b00448696aea62ls2956794lfu.0.gmail; Wed, 16 Mar 2022 21:50:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy+/g4N/eClF0vsmxTI7MVTz7LGhb5zALn5ZIG12X6IZPd01lS41LLqYRd70yARGrGPmUw1 X-Received: by 2002:a19:3856:0:b0:448:2019:3e94 with SMTP id d22-20020a193856000000b0044820193e94mr1800855lfj.370.1647492625683; Wed, 16 Mar 2022 21:50:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1647492625; cv=none; d=google.com; s=arc-20160816; b=uFRH87Ciz/Q+b50dx9QvwHxnQfx9P91YRoMPFQG7aGq/m/FgDgVuLzahnIKhqjRBQC Qg07Rk8kqMujUPfQlVdI+3d6Jierlkto9jKIgaNTRK0XJQfuHYNVrblukWHZfv72qsSw oo5EUpfLsk0xP71KW5LmHoXIGqftAApIgnMxWtPA6dzAEtqt+LUqHB4aEjNQoYnD7I/j QI3N2APeC+aHyvsuWdNgXtzAyX5Kb5Z/VNGVxbUvAwl170aIcUuT/FnPTOeQ/mMT66W+ /v2jtp3G01kvaIMnQbKLAkz/URe/KB1ruAUI/PyOCw4+v4vJ8xBgojB6MRL6TNkUsFbc IkDA== 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=OzLLcrpVzIYSqhxfftUdhE90A+6B1kw6gvSpPqHmv3I=; b=Clj1W7egRaOlbNLTEASajp6t/vDYldgs1iyUVbD7a9P2qLpoUXCnuK2z/bif8rhmXW p3U2jNRi7c8yIVs0yycaccYSyuxn9VRhkajS7/uTjJagLZsfbHxZ8xI6EKtkPYgMgkbO 1Na43kMp0IfnNj+8/8LunbCK9l+sy+KL6KKFfTLIjEUXeHz3sGWZ8Ch1w5zQHovoFIrN CxZPGOf8sOOC7JMAXbF/h9aKvmgqS5sUMd48w3XD9Co8IFXyuWvOEJVF0Lt+WfTiYjQq ng7hyD1uYWFikdxEouJ4urNXkvOB/s71v0hEzplId6m6Ac1OQuU2SmmmRxULQ53dDDsW priA== 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 e15-20020ac2546f000000b00448ba65ba9csi174168lfn.13.2022.03.16.21.50.25 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 16 Mar 2022 21:50:25 -0700 (PDT) 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 22H4oLHg025716 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 17 Mar 2022 05:50:24 +0100 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v8 09/16] sbuild: Add ccache support Date: Thu, 17 Mar 2022 05:50:14 +0100 Message-Id: <20220317045021.4018-10-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220317045021.4018-1-ubely@ilbers.de> References: <20220317045021.4018-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: u8VPwuHp4Q+K 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 b3931850..2392d894 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="/home/builder/${PN}/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 cfd0acd5..63820793 100644 --- a/meta/classes/sbuild.bbclass +++ b/meta/classes/sbuild.bbclass @@ -157,3 +157,26 @@ 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} + + (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 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