From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7037496833474560000 X-Received: by 2002:a17:906:bc46:: with SMTP id s6mr24611969ejv.467.1638544936210; Fri, 03 Dec 2021 07:22:16 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:907:960d:: with SMTP id gb13ls3902486ejc.11.gmail; Fri, 03 Dec 2021 07:22:15 -0800 (PST) X-Google-Smtp-Source: ABdhPJxfdkoq/9XVHfVCasR+3prxh7L11n2ndCJKmLewJxeXSMupu1NfsQk7NXCt9+0GiEZwAm6D X-Received: by 2002:a17:906:bc46:: with SMTP id s6mr24611873ejv.467.1638544935285; Fri, 03 Dec 2021 07:22:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1638544935; cv=none; d=google.com; s=arc-20160816; b=TkeBtNvis0o0H89ICcHjxDkPma1g5VyPM4L7uEMRYZH0LPTMBrf39i5IIrM5BL/cBg mZGQpkGutwuWaJJd4b5un3HzXJO1AzZ0OSO0cny0RSSTCNeVS1t2fFbiQ71C+3D2MIG4 AmioRT5wRqvGAgCby2NjTtdxQoDpiS/SDAgTlshM4xiPl/2pIp0X7+wMMWYsoaVcaxg5 SkJoqNQLXELJI9kb7kY8TJ830LacrZQCf3N8R91+uzphsxn1c5hP/+yjAEmeFkZFxC74 Vu0PDdZWXZEqx+1mAwmJs2tLrThVZj+Dt4bdP5h3lRBBACQvomOZZQfkC8i0doNi0CQ+ 7tcw== 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:cc:to:from; bh=5q61U8uI3MQs2mF+ya2DPyYkXPQ8wJwLng4HfkoFnMc=; b=oGwSjeuSedsgRI1+ZTEIfgAkJibN+LNk9F1q4c8m2dO+hgft0yP6KZpEcAWbEOuG24 y61qhUjbfBf/u6osGqmsA/Hc0yFPzRIC7P9b1evWjbqUgTgdjEEUWq3iJvs48dnGu4SD VexLgexztFXGs/SC6iaLPq0tyf9TZcNeKxCDI/xo742LBuQ1QalZrsU1s8csStZVSmik KR79H8ZoiBluqdNkTVbrhxaxl/t0eJGemiaIIzcHcD0cn0QIf9yHfLRdDvUDZ/07Uu9R fEsCPxC1gPtWE3u8BLV46ESL/dZd+e2q0GZKyW2od7oX8OsxttFfvibUfvPWShQ3rZu4 K4gQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of felix.moessbauer@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=felix.moessbauer@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id d5si305208ede.2.2021.12.03.07.22.15 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 03 Dec 2021 07:22:15 -0800 (PST) Received-SPF: pass (google.com: domain of felix.moessbauer@siemens.com designates 192.35.17.14 as permitted sender) client-ip=192.35.17.14; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of felix.moessbauer@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=felix.moessbauer@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id 1B3FMEB9026080 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Fri, 3 Dec 2021 16:22:14 +0100 Received: from MD1T0KAC-VM.ad001.siemens.net (md1t0kac.ad001.siemens.net [139.25.68.224]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id 1B3FLsMI016062; Fri, 3 Dec 2021 16:22:14 +0100 From: Felix Moessbauer To: isar-users@googlegroups.com Cc: jan.kiszka@siemens.com, adriaan.schmidt@siemens.com, Felix Moessbauer Subject: [PATCH 2/2] refactor: inject ccache environment similar to proxy env Date: Fri, 3 Dec 2021 16:21:36 +0100 Message-Id: <20211203152136.3260090-2-felix.moessbauer@siemens.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211203152136.3260090-1-felix.moessbauer@siemens.com> References: <20211203152136.3260090-1-felix.moessbauer@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: 50OaeviAjdNV Instead of configuring ccache in the build shell scripts, we configure it by preparing the environment of the calling task. The tasks invoke the build scripts using sudo. By that, we have to modify the PATH variable inside sudo as sudo itself clears it and sets it to the value of secure_path. Signed-off-by: Felix Moessbauer --- meta/classes/dpkg.bbclass | 3 ++- meta/recipes-devtools/buildchroot/files/build.sh | 5 ----- meta/recipes-devtools/buildchroot/files/common.sh | 4 +++- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/meta/classes/dpkg.bbclass b/meta/classes/dpkg.bbclass index 7da7334..27fe84f 100644 --- a/meta/classes/dpkg.bbclass +++ b/meta/classes/dpkg.bbclass @@ -32,7 +32,8 @@ addtask devshell after do_install_builddeps # Build package from sources using build script dpkg_runbuild() { E="${@ isar_export_proxies(d)}" + E="${@ isar_export_ccache(d)}" export PARALLEL_MAKE="${PARALLEL_MAKE}" sudo -E chroot --userspec=$( id -u ):$( id -g ) ${BUILDCHROOT_DIR} \ - /isar/build.sh ${PP}/${PPS} ${PACKAGE_ARCH} ${USE_CCACHE} + /isar/build.sh ${PP}/${PPS} ${PACKAGE_ARCH} } diff --git a/meta/recipes-devtools/buildchroot/files/build.sh b/meta/recipes-devtools/buildchroot/files/build.sh index 8e6507c..101581d 100644 --- a/meta/recipes-devtools/buildchroot/files/build.sh +++ b/meta/recipes-devtools/buildchroot/files/build.sh @@ -14,9 +14,4 @@ for i in configure aclocal.m4 Makefile.am Makefile.in; do fi done -if [ "$use_ccache" == "1" ]; then - export CCACHE_DIR=/ccache - export PATH=/usr/lib/ccache:$PATH -fi - ${GBP_PREFIX}dpkg-buildpackage -a$target_arch -d --source-option=-I diff --git a/meta/recipes-devtools/buildchroot/files/common.sh b/meta/recipes-devtools/buildchroot/files/common.sh index 7085f44..73226d8 100644 --- a/meta/recipes-devtools/buildchroot/files/common.sh +++ b/meta/recipes-devtools/buildchroot/files/common.sh @@ -17,7 +17,6 @@ fi # Create human-readable names target_arch=$2 -use_ccache=$3 set_arch="--host-arch $target_arch" @@ -28,3 +27,6 @@ cd "$1" export LC_ALL=C export LANG=C export LANGUAGE=C + +# allow for changes to the PATH variable +export PATH=$PATH_PREPEND:$PATH -- 2.30.2