From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7075595997826514944 X-Received: by 2002:a05:6808:170b:b0:2fa:729a:a42e with SMTP id bc11-20020a056808170b00b002fa729aa42emr12274757oib.0.1653316606540; Mon, 23 May 2022 07:36:46 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6871:79b:b0:f1:f328:8e8a with SMTP id o27-20020a056871079b00b000f1f3288e8als4739736oap.7.gmail; Mon, 23 May 2022 07:36:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzUJEFGCzU0kPyHQHiq+f8smStGwn4jxrj2sxeFkfmXMaaSrmeBvuTneoFXDpN52gNxjluG X-Received: by 2002:a05:6871:b2c:b0:f1:d6ce:58d1 with SMTP id fq44-20020a0568710b2c00b000f1d6ce58d1mr11747939oab.33.1653316605973; Mon, 23 May 2022 07:36:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1653316605; cv=none; d=google.com; s=arc-20160816; b=bVp8pHP77XwN1Wb46FpYEX/yn6nXv5TAyopootzGdWJFO5JnLu5OMqGSlQDndU4i+p rGCCyJ/TxHdsQ0hh/A6uGXhHbYefarzTULMPm5EiB/DJjiUpOIEXsItHUC804C0wUvxs Ov+SNwuNUfYxOJMAOVVx5o0RvvowHYX+hF4Qa16swPymNPWIrXeUHLiXhx8Ng5UI+bEq KldBvMs3mqfZfUD3gmxWAsQForfla4pX8LU0pwuhtiOIUCs/w2JpFVQtWa4lLzORLjnD 3XFoITNhpDzNyFSl/KKAmV+e1UH4SOCQ6UtM7Vdqo2HZh5GRMWVBW1VcIIynlWk9IIjw wo9g== 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=X4wJWKoobfkTxsk5W/YCwFQpVxZaelWLJqqGppYJkko=; b=QFfGDhUZqxoLRMrQep7T4wk8B7ObKOuKQr/gw4GnRqHW6WMzsEK+YjawI9Q5NACl0T ZVn4HUWxiN1t807pgP3G7Hvhic/l8tZDhRHDttIt2K1GZW8ykj1/lM9daUmiZMtpJNqR 3ffexxu+cSy0GDjOeQdqB9OnSsRBbiuDSvxSK5bV/ypUwVTk6Ad+eR+nEBZL5CtGGUYY e52MJDRjOVxyc04f1woo609ofTockE9Z/V4xMc/VGwt/MJIH2SRfdYbPvD4pdLKgVWvR I6P2TDx8tqKbrWJLWa/hIHvMlDYCZiMFiUByV5vzeuLipK00COvjjaPbSgat2CRbnca/ UuMQ== 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 fq38-20020a0568710b2600b000e217d47668si1428786oab.5.2022.05.23.07.36.45 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 23 May 2022 07:36:45 -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 24NEaO3e024879 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 23 May 2022 16:36:44 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Felix Moessbauer Subject: [PATCH v11 18/21] avoid absolute SCHROOT_* paths to improve caching Date: Mon, 23 May 2022 17:36:14 +0300 Message-Id: <20220523143617.24759-19-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: up0w108BJa9a From: Felix Moessbauer This patch reworks the logic to setup the SCHROOT_* bitbake variables by making sure nothing is expanded. By that, no absolute paths into the build host are exposed, which finally makes the recipe cachable. Signed-off-by: Felix Moessbauer --- meta/classes/sbuild.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/classes/sbuild.bbclass b/meta/classes/sbuild.bbclass index a78b15b..f9bfaaf 100644 --- a/meta/classes/sbuild.bbclass +++ b/meta/classes/sbuild.bbclass @@ -14,11 +14,11 @@ python __anonymous() { if mode == "0" or d.getVar('HOST_ARCH') == distro_arch or \ (d.getVar('HOST_DISTRO') == "debian-stretch" and distro_arch == "i386"): d.setVar('SBUILD_HOST_ARCH', distro_arch) - d.setVar('SCHROOT_DIR', d.getVar('SCHROOT_TARGET_DIR')) + d.setVar('SCHROOT_DIR', d.getVar('SCHROOT_TARGET_DIR', False)) dep = "sbuild-chroot-target:do_build" else: d.setVar('SBUILD_HOST_ARCH', d.getVar('HOST_ARCH')) - d.setVar('SCHROOT_DIR', d.getVar('SCHROOT_HOST_DIR')) + d.setVar('SCHROOT_DIR', d.getVar('SCHROOT_HOST_DIR', False)) dep = "sbuild-chroot-host:do_build" d.setVar('SCHROOT_DEP', dep) } -- 2.17.1