From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7237382540581928960 X-Received: by 2002:a05:6870:d8ab:b0:17e:2e88:40dc with SMTP id dv43-20020a056870d8ab00b0017e2e8840dcmr128996oab.11.1685084435222; Fri, 26 May 2023 00:00:35 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6870:4c1:b0:19a:1554:7a3c with SMTP id u1-20020a05687004c100b0019a15547a3cls1189946oam.1.-pod-prod-01-us; Fri, 26 May 2023 00:00:34 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7z+TwzhSWuxmYiO4p3cXT6Zx+yls97zVOoNE7RYYLzC48HoZp6p3HHWqJeklIudPvZYY2/ X-Received: by 2002:a05:6870:9202:b0:19f:1a92:6e11 with SMTP id e2-20020a056870920200b0019f1a926e11mr88737oaf.24.1685084434638; Fri, 26 May 2023 00:00:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685084434; cv=none; d=google.com; s=arc-20160816; b=BrWMjARniDYYjlLxRpBPC6TfTFQkatTthpt+nEx1qbGZ5HvJICvB778ipX0A4mnDj+ Smin+Hhb0AgvIdhlynpwaQ9xwG9BLXytCoxHeNdsHWHcNhcvXU012th3ytCxbhTPaaTy fhIeOhZ4OT3V8xzvBv7D+ux6dk1W7MYgZgn0+n+Ev4vlzFMEhGXHqumJ8ngNzc1gg0dj VwbE0D9M3CkBORjEGjYf2q85pu5+ZED7XILa3Ozrph1As/9ro7DuUWucIZwGrgM5lTVO fsOO/dbpRArz4kuQcr6UpM7Foy2WOKTg2BzynpQ3zesATe6L23DQQEPgqpsuJ5ss5cXz +zFA== 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=lfWzBv7rPSEXRFaEpQMvS2BW4zJgUuCmH6MDtGt4Gdc=; b=cQto5rKe4CtnTHA1F4ZsnfwOWJKReiSwBKqFE5apRZZhDdYTK84Iqmi7RjBiadCZ9C Vq0Suc5IxAGsuD3PEHlgsUk0ga4ZERtHkisYE/vaklw0jQJotbZ91jYBsO5yu1+wu5mX 1YAypx9YzEfisK6NBtdV1uYIUdB5BUJuirhBee7MtcIOU2lQG4Zq38OwVmRqJ3RGoSIc Z+awUd1RjXL8yPyqpMCPT6rFu8i6prschdL47/pgNh/0HL4CjU396zOueK5CNrFYq5Rv vBkH5sKycy5IdjlY2OW9EntNX3h217MhNzm4+d+POLZ4K4aB4YPTrzX8mxQq/41Z7/pu fQuQ== 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 qj4-20020a0568702f0400b001934f67653asi516496oab.0.2023.05.26.00.00.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 26 May 2023 00:00:34 -0700 (PDT) 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 34Q70R3V013306 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 26 May 2023 09:00:28 +0200 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v5 01/12] meta: move base-apt from deploy directory to the top Date: Fri, 26 May 2023 09:00:16 +0200 Message-Id: <20230526070027.16890-2-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20230526070027.16890-1-ubely@ilbers.de> References: <20230526070027.16890-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: ifHNvgQlfEF7 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 a85fea77..89b3e6a3 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -97,8 +97,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