From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7202866696458076160 X-Received: by 2002:a17:90b:48c3:b0:234:bd18:61e4 with SMTP id li3-20020a17090b48c300b00234bd1861e4mr2492200pjb.83.1677048091219; Tue, 21 Feb 2023 22:41:31 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:90a:a091:b0:210:6f33:e22d with SMTP id r17-20020a17090aa09100b002106f33e22dls1244305pjp.2.-pod-control-gmail; Tue, 21 Feb 2023 22:41:30 -0800 (PST) X-Google-Smtp-Source: AK7set99w6JlWGvSp3NJO5nDEpUZdX7vSEJcNDH/BogJJhZg4NJJRD6C+QQ8KS5HIrDiuc2AqMAL X-Received: by 2002:a17:902:f543:b0:19a:96f0:b0f with SMTP id h3-20020a170902f54300b0019a96f00b0fmr5976804plf.28.1677048090364; Tue, 21 Feb 2023 22:41:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677048090; cv=none; d=google.com; s=arc-20160816; b=fndkpO0JwbcFdpLKJ/A/tTOmOgN6Y2zpSpGF7h62dkSGwm+gn5elxvzcAHXX8oL3Hr 9DhiTkqWQUqYRdYvbrSLq2XpuLotfP0p5/+9JeRXzI8QPuTVdkZUOZeJGput8BhKfhgF c09i3Ur1jfqvYJDzKHrUglWG91yutfC0EMCzjqC8QmFRY2Mlx5aTY36arUqlaJnRXOt0 AFJG5TcraEil+su+xg7UYy/LhxvlmQUbevujeMKLz0Z4Gz5iHoNokLZTUFyxVfTKUhkB FqC1KcsxHuDdSjVcLsSHn7c5s0wgtBJgo001RoYpSF8AoMoz3y7TzPrt/BF+97hIb3/X Arbw== 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:to:from; bh=6PcytAE6xy31MPj9bynLG5S5i1xXS7skNxPXL/yhu4Q=; b=ad6/yPAM8dGpODG54+0hnVq2DuHF75QF8FmC0h9t61jPUD+YiEREs0M+wmCe7AvXxV gkLjm3UKGD019v7Bgm5RhO1X9kX+JrrnCiFDiHWT6GvDFviI/KrURB0e4Dp3eBg1YdYk FIPaic4LRmmRqq3SR2tcKeobFA7YvRfYVyxJNWhu86yXDXscjjVypKQX80LNqANgF9vM Bvflxax99FDX6qWTLhp188v34wI1jaRceBPqHOxjtMscxMV5/2FM+0X6b1nLXqMiiX05 hu//ReppU8tecJbQCzzluRhFXdZKnSsfZGdbpPI66Vt4ozvPKkHQ09JNeMCY2lvI0vcx K3/g== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id k18-20020a170902d59200b00198e7ebaf1dsi391708plh.9.2023.02.21.22.41.30 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 21 Feb 2023 22:41:30 -0800 (PST) Received-SPF: pass (google.com: domain of ubely@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 ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Received: from baighyz.m.ilbers.de (host-80-81-17-52.static.customer.m-online.net [80.81.17.52]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 31M6fPc9011872 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 22 Feb 2023 07:41:28 +0100 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v4 05/13] meta: move base-apt from deploy directory to the top Date: Wed, 22 Feb 2023 07:41:17 +0100 Message-Id: <20230222064125.22754-6-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20230222064125.22754-1-ubely@ilbers.de> References: <20230222064125.22754-1-ubely@ilbers.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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: ReKYeQYQ5W1x While base-apt is supposed to be always used for deboostrapping and installing build dependencies, move it out of temporary directory. This also allows not to change some of CI tests that completely remove TMPDIR and underlaying DEPLOY_DIR. Signed-off-by: Uladzimir Bely --- meta/conf/bitbake.conf | 4 ++-- testsuite/citest.py | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index bea62bb2..361bf1f0 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -98,8 +98,8 @@ REPO_ISAR_DB_DIR = "${DEPLOY_DIR}/isar-apt/${DISTRO}-${DISTRO_ARCH}/db" THIRD_PARTY_APT_KEYRING = "/etc/apt/trusted.gpg.d/third_party.gpg" # Base apt repository paths -REPO_BASE_DIR = "${DEPLOY_DIR}/base-apt/${DISTRO}/apt" -REPO_BASE_DB_DIR = "${DEPLOY_DIR}/base-apt/${DISTRO}/db" +REPO_BASE_DIR = "${TOPDIR}/base-apt/${DISTRO}/apt" +REPO_BASE_DB_DIR = "${TOPDIR}/base-apt/${DISTRO}/db" # Setup our default hash policy BB_SIGNATURE_HANDLER ?= "OEBasicHash" diff --git a/testsuite/citest.py b/testsuite/citest.py index 17a90244..2393e275 100755 --- a/testsuite/citest.py +++ b/testsuite/citest.py @@ -86,9 +86,11 @@ class ReproTest(CIBaseTest): self.init() try: + self.delete_from_build_dir('base-apt') self.perform_repro_test(targets, signed=True) finally: self.move_in_build_dir('tmp', 'tmp_repro_signed') + self.move_in_build_dir('base-apt', 'base-apt_repro_signed') def test_repro_unsigned(self): targets = [ @@ -101,6 +103,7 @@ class ReproTest(CIBaseTest): self.perform_repro_test(targets, cross=False) finally: self.move_in_build_dir('tmp', 'tmp_repro_unsigned') + self.move_in_build_dir('base-apt', 'base-apt_repro_unsigned') class CcacheTest(CIBaseTest): -- 2.20.1