From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7075595997826514944 X-Received: by 2002:a05:6a00:1501:b0:510:7ab8:71c8 with SMTP id q1-20020a056a00150100b005107ab871c8mr23828895pfu.63.1653316598157; Mon, 23 May 2022 07:36:38 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6a00:1810:b0:518:abc2:56c6 with SMTP id y16-20020a056a00181000b00518abc256c6ls1170877pfa.11.gmail; Mon, 23 May 2022 07:36:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJziVZh60ZGDuiwQDgLNuvz3r87gv4IPzWqWW/ZeUNHQ620rfdn7wlTCUbDt8Ot3Elnnlxnb X-Received: by 2002:a63:48b:0:b0:3f6:4ded:378c with SMTP id 133-20020a63048b000000b003f64ded378cmr17435330pge.163.1653316597402; Mon, 23 May 2022 07:36:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1653316597; cv=none; d=google.com; s=arc-20160816; b=j9PKKR2br9jsqdHwEGugs4a0rWknkGBDa/H4IqluKlZRARL5zorRLJEFQDDgmg+nb7 2R/Lp5pER9xgQtNwl+8HbX4RdH2+9KqCVe/4o5fi4WA2vpBfsp7KXjWy4yMDvMygbGRT RWaqZ6B1hoRj1PGT+obJVecYgLBiBr/o31GLCLfuYJXWMbnJ1y6kj/NAorwMgs2nh82P IdR7ZKYR4FxGe37sXFVYWTc9vsJRvJIbItPVown1b/C/MXWzTSZ/CbJZtqeFouMc16QZ 1LcbnR8MKjk9/DvzRhi6cYur5BCWWyIYOvc3PhUKVY6ll1yzNYEY/vAYcsCkcU4XdA7G 7z6A== 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=pJkHmbNWuCSi6t1odD6LaHD64r1DMny3ny8TN6XT256+V8xqvICRwly0T+PZjH9pts jvFl34x9b0WfyVpUz6rMownkqdzdRCXlffDT0Yv+ZHaURU8zmCwAXcuqZ1+cOAL1BVCz IU5ncXZe61SoS8xirGhcE7KcD+cxKKhznP8PSdS4f9U0UQvHeTywk0/qU6IFk+tbdM9M gXyQiQ+Q+Zb2DgUoMXyeeLMg9NiyRUEsR/AcI7rLOAxtSdWPa2FTl1nHxm7Pv08jA93c grWbKX2aDfWK/X2GQ5LVBm9uW0zKEtpFXat3cz8GeLncA0DZd3z9cIzBzWIHdF2BSib3 Do1w== 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 nu12-20020a17090b1b0c00b001dc5c02d737si871837pjb.2.2022.05.23.07.36.36 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 23 May 2022 07:36:37 -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-40-50-214-37.mgts.dynamic.pppoe.byfly.by [37.214.50.40] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 24NEaO3V024879 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 23 May 2022 16:36:35 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Uladzimir Bely Subject: [PATCH v11 09/21] sbuild: Add ccache support Date: Mon, 23 May 2022 17:36:05 +0300 Message-Id: <20220523143617.24759-10-amikan@ilbers.de> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220523143617.24759-1-amikan@ilbers.de> References: <20220523143617.24759-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: Hqof4WAzKYDG 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