From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7126922054506381312 X-Received: by 2002:a7b:c5d2:0:b0:3a3:55d9:fd36 with SMTP id n18-20020a7bc5d2000000b003a355d9fd36mr11779248wmk.52.1659365850340; Mon, 01 Aug 2022 07:57:30 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:2409:b0:397:d1d5:9b4e with SMTP id 9-20020a05600c240900b00397d1d59b4els3686842wmp.3.-pod-control-gmail; Mon, 01 Aug 2022 07:57:29 -0700 (PDT) X-Google-Smtp-Source: AGRyM1twcPbmmbd11z4PCFvB04Uo8GJGScPm4u8twEVWL4+Or1Py/MDBT4Gh2L39Tj50Hd1WRqWG X-Received: by 2002:a05:600c:34d5:b0:3a3:561c:a9c6 with SMTP id d21-20020a05600c34d500b003a3561ca9c6mr11432475wmq.106.1659365849425; Mon, 01 Aug 2022 07:57:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1659365849; cv=none; d=google.com; s=arc-20160816; b=gMLB2Gx2jG9c1iFoajpU9IiJwqYWN3amQxABjSJPN/03dFHS32Iqm80qPL/rC2l/WO R/j3k8b7Rn/vbIkaCP0wPM8gOg30aCngWo6gw/DORybPHKvZKE3JoDifxALNjZDhRLVG EGwzd3xYfZwxPlabUIihpzhfClztfWTYmZzZY+TX2WIqXTdbeMXPQo8O9WSAW0CzYgrI cEoM3OVuwwyGvV0Jb0WdUtmbLKloWwv2oZJqPMdwd2J8aUnHEsUmdti8KHfUSypTgIwH YT8C/BKPJsPUUly5SbEdIrBqEAcuyFPwNHlCVd5nddDWTHpKalMvWpe9CAUC401lEaOu BIkg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=feedback-id:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=+WmBD73g1VWsrEr6Hb3/fEVLuRACGUseZ1ikRYN5uXM=; b=Oq80ix/wU8CvnJav/CqJsDpR4OkBDdtGr8BG+gwg5KMWG5oozma6rapslCHjnmBUPS Kilrb4eFNB5kDgfjl0w/RO0B0FR/c2ZFyjRr5Xbg5BrnpE3XgzuD54ontrlKPrvJjLQa sqOak+FI3IejnmHQxOw17Qla4RcNRIW6nRbllEwA1uSwQ9w5gpMgHnfTgUzK8RgSHeuz hTg1vkQIQG/8teBv5K/2jrESCvkD7jN80GeT5/bCyd7t7DLHPqoOni8qa8KPvLGi2REv 8Dg9iBNDf+MSrWX7yplsRoqevND18nYawhEMMtRyXm2fxX6iA3lXzDmD9Gn6uZumTmE4 tDuw== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=iDkEz26Y; spf=pass (google.com: domain of fm-72506-20220801145728faa3f3254051fba3e8-0hvz51@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-72506-20220801145728faa3f3254051fba3e8-0HVz51@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from mta-65-225.siemens.flowmailer.net (mta-65-225.siemens.flowmailer.net. [185.136.65.225]) by gmr-mx.google.com with ESMTPS id r4-20020a1c2b04000000b003a31bb11cdfsi592817wmr.2.2022.08.01.07.57.29 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 01 Aug 2022 07:57:29 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-72506-20220801145728faa3f3254051fba3e8-0hvz51@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) client-ip=185.136.65.225; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=iDkEz26Y; spf=pass (google.com: domain of fm-72506-20220801145728faa3f3254051fba3e8-0hvz51@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-72506-20220801145728faa3f3254051fba3e8-0HVz51@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: by mta-65-225.siemens.flowmailer.net with ESMTPSA id 20220801145728faa3f3254051fba3e8 for ; Mon, 01 Aug 2022 16:57:29 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm2; d=siemens.com; i=felix.moessbauer@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc:References:In-Reply-To; bh=+WmBD73g1VWsrEr6Hb3/fEVLuRACGUseZ1ikRYN5uXM=; b=iDkEz26YWwsu+0el7DjPCE1BFdJOEB54w7yQOc45V/FNlW1aB5WBpMspbTBSQoiPj+WMZP KQHFOcvKwYP4utO7TnBM33/ULdY02cTKjKuN2IHQIZsJGPblUNSkYwhpzYbxLSacMLeoKjDG a3YO4oFUw1/PpvJN3QpigaadOabtQ=; From: Felix Moessbauer To: isar-users@googlegroups.com Cc: jan.kiszka@siemens.com, Felix Moessbauer Subject: [PATCH 2/5] move CCACHE_DISABLE env var to function Date: Mon, 1 Aug 2022 16:57:16 +0200 Message-Id: <20220801145719.546953-3-felix.moessbauer@siemens.com> In-Reply-To: <20220801145719.546953-1-felix.moessbauer@siemens.com> References: <20220801145719.546953-1-felix.moessbauer@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-72506:519-21489:flowmailer X-TUID: pVG6wkTzRkSZ This patch moves the CCACHE_DISABLE environment variable to the isar_export_ccache function to consolidate the code. Signed-off-by: Felix Moessbauer --- meta/classes/base.bbclass | 2 ++ meta/classes/dpkg.bbclass | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index 17dfeab9..8c874f31 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -177,6 +177,8 @@ def isar_export_ccache(d): if d.getVar('CCACHE_DEBUG') == '1': os.environ['CCACHE_DEBUG'] = '1' os.environ['CCACHE_DEBUGDIR'] = '/ccache/debug' + else: + os.environ['CCACHE_DISABLE'] = '1' do_fetch[dirs] = "${DL_DIR}" do_fetch[file-checksums] = "${@bb.fetch.get_checksum_file_list(d)}" diff --git a/meta/classes/dpkg.bbclass b/meta/classes/dpkg.bbclass index 67b5aac6..0f1112ff 100644 --- a/meta/classes/dpkg.bbclass +++ b/meta/classes/dpkg.bbclass @@ -34,6 +34,7 @@ dpkg_runbuild() { # Don't warn some variables [ "${var}" = "PARALLEL_MAKE" ] && continue [ "${var}" = "CCACHE_DIR" ] && continue + [ "${var}" = "CCACHE_DISABLE" ] && continue [ "${var}" = "PATH_PREPEND" ] && continue [ "${var}" = "DEB_BUILD_OPTIONS" ] && continue @@ -62,8 +63,6 @@ dpkg_runbuild() { if [ ${USE_CCACHE} -eq 1 ]; then schroot_configure_ccache - else - sbuild_export CCACHE_DISABLE "1" fi profiles="${@ isar_deb_build_profiles(d)}" -- 2.30.2