From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7114179385042665472 X-Received: by 2002:a05:6402:4385:b0:435:9104:955b with SMTP id o5-20020a056402438500b004359104955bmr21077721edc.45.1656398984525; Mon, 27 Jun 2022 23:49:44 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6402:40c3:b0:435:89f5:289a with SMTP id z3-20020a05640240c300b0043589f5289als4087774edb.3.gmail; Mon, 27 Jun 2022 23:49:43 -0700 (PDT) X-Google-Smtp-Source: AGRyM1vqr5SmfmbF4eyg9+ueyzV1mi4V4e4wK8u0aLU5fmwXYkudYbTcTJdn7y96ExGs6ooYBpEy X-Received: by 2002:a05:6402:27c9:b0:435:d420:5ebb with SMTP id c9-20020a05640227c900b00435d4205ebbmr20947872ede.89.1656398983578; Mon, 27 Jun 2022 23:49:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1656398983; cv=none; d=google.com; s=arc-20160816; b=GeWb7ArTRbRaCNKXWgqZCjaK+MDdLhcuKLTpk1Jt1mUVC05+Iim4YojbAYdISQui6x facgI+MrWWowFfEVTJUbZssvRLPH9WjIWhc0Y7YGJqfPKRkKVd6+EFHeadvrwGmun8fC F29E0ieowYEZXNCIIWwGzWDK6+icY4pi7/aT8LX41VotJJ/Se77fuy2Qtpwe3GESIzHq cFmnPTWBqdK6uFtEVYOIfyg9pRJARJ+ZCDxtMEuaQFQrmn/GYe5V+cunTjIPvqqaaqeT r5GpRqmEYgakhPpRtIoz8WQk33dZ4gVXxxF8kh+W0jqZKyTzYYiyyCbryvmQiO+iKn6n PQ5g== 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=zGkTV0DdeNSEtxDNE0b2yKmGsdJrNhnA1kwGAqESk2y8rJ2QU/VjipEW1tcLocrHcZ iLd5bbOf9FNPsVI+jSiAqeRcrF4UK/ciixRFdYo9BBwq4TX0u42aNxpLxU4XMFVH2SKs XbBBQCoGvF2iOiwmRy9FMK3gdxPdXbM6z0s9hjtIiI5aGjldI3UPYlA8hsDgH6Ndmk/x BSZgiGvJDW3Z0aWOXoYfiH9Kttco0dYBtOX6uEDcOAtK02BI4sT7QmxXgKLLmKH5LP7b EIjUTKNXPkEdRjNn1zL+0dUMfCliM7ZzfomZeDyhzPgTcUXWEn0pZFyk/fGakKBJ12T1 +RTg== 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 a5-20020aa7d745000000b00437ba7fdb50si1220eds.1.2022.06.27.23.49.43 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 27 Jun 2022 23:49:43 -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-172-27-214-37.mgts.dynamic.pppoe.byfly.by [37.214.27.172] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 25S6nMSM030758 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 28 Jun 2022 08:49:42 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Felix Moessbauer Subject: [PATCH v12 18/21] avoid absolute SCHROOT_* paths to improve caching Date: Tue, 28 Jun 2022 09:49:10 +0300 Message-Id: <20220628064913.27938-19-amikan@ilbers.de> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220628064913.27938-1-amikan@ilbers.de> References: <20220628064913.27938-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: vri2mwRa9uEh 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