From patchwork Fri May 26 07:00:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Uladzimir Bely X-Patchwork-Id: 2838 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Fri, 26 May 2023 09:00:44 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-oa1-f56.google.com (mail-oa1-f56.google.com [209.85.160.56]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 34Q70eOh013359 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 26 May 2023 09:00:41 +0200 Received: by mail-oa1-f56.google.com with SMTP id 586e51a60fabf-19ee7ab1708sf187031fac.3; Fri, 26 May 2023 00:00:41 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1685084435; cv=pass; d=google.com; s=arc-20160816; b=AqcuhL5ODVzAblxWUmgQDkgayttO6laZ82ZliJ/gTK/VNWk8uBCBDlpHngrsHmJDkq PV67XmcuLgxxFHCNLyF//CIlUnTAt3VlfSy8EnW1wgyP0u7MqvFCEgnpe+aA/0eagRQM oluLjDF7nN3ixoXR/2fC+VhK2NLjhgnKS7jA9rE6MJOIdL3zoul2sQ0HF31aoWOymKGm YlyYqVcS67EwJKq8nH3Q3xqxVw2uaYrgrIxQcNMsI2xbl9E3khzdmhVGngL87+VjFXm0 UGwUkygefBrPkczcot+IrPfJLZb3t/GsPxbuyJrW+SnFPr4EIdjaC8oU+8tDDIbeozwC a7Ng== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:to:from:sender:dkim-signature; bh=EJPcgfnbbI3Pa07TQ3t6A+tg+01HGQT8eM3O14SkXw0=; b=xza7/t4JlXzkXfMXenHsaFPR9W+nEpZ2jMV8DEvq18WrL1X6Zf4b8QkISN4M1Y1o1z ZwHMOA7b70dUxD5GR2B7AQQ2uheGAM4YLDK0V4VoTb3pPe3x6c0yiDxqKs4bV3orUWJa JyLuMg4DBjLto1U9U9ZvIrnY9uV2UFRaVV6Q06Fy+Rh2WAvErGonBtOAN2oEuYhSjJll OIEqeT20dQs6HXAuUMfrN/pIi8r5EHiRBusgc3LMHVIG4MO5A4SOudtdWxbARbxc4Iym 4WQcqAvngFwcL+sioLhzOGEI3OvhvoK1uueGmkLz2LIyrVoeYLPh1UtN3koyomuPAk7i Z8Iw== ARC-Authentication-Results: i=2; 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20221208; t=1685084435; x=1687676435; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:to:from:sender:from:to:cc:subject:date:message-id :reply-to; bh=EJPcgfnbbI3Pa07TQ3t6A+tg+01HGQT8eM3O14SkXw0=; b=EHj7lUqtJxrTjmivPNnMU6LzssZHlakBjrGD5CpmdL60jlAJs/wYaft3YaEnukDlvZ kzOk9QJI8HyB42u7aUN1v7Xt4Ep5T+OtQ/6ttjh4MZBcwiakkDQytaP9zm0h2ruLy+tL CODD3i9e0jDc6OuPfX5kR9eD6cTPbirQDVzI4t1Glv39+kvyyl1MnO62rtdS+S6GmlD0 Qo2mSJvODsEH4uwEXFiaQTXILEA6eWuoNLldj5HFrt3Kts7cxO1g08TH1OZM26XFTcLk SzPWi74/YeerrkYzjY5DiVna96IZ2ZSmM0wQ2mEQESxqZNRp9v/CZLYXWD0Km5kdoaeH X3RQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685084435; x=1687676435; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:to:from:x-beenthere :x-gm-message-state:sender:from:to:cc:subject:date:message-id :reply-to; bh=EJPcgfnbbI3Pa07TQ3t6A+tg+01HGQT8eM3O14SkXw0=; b=S63lZEm+b22U/ncyAa7HcxMSP26mj4pXjV2yhm45cHR6RhsNb30rLzujwmQArs0vtL K34qlZ6jlkFoDCEB/VYDjsMN+5cn0lar7ayyffzVyM/cs7Pl9Xg/uxYkqLZD0LxlWXPo 6tO/kUcpV1DT759KuwoxUuP4b/76eKfRG7aDGqp5Gvt9uCdv6z1fRjX+Y3gaeZe+oIMi yip1KlsBAEqGR0ZCJ5S4v4WcJWv8C6Y6xazWoaIlESpygw9YyiLMHIhrW5xoZpJ57/Q5 7htfKyabWiW1YjPvxbBGxPTPlme0ZYuOEB1SVPrLRogNfO1X8ZbFRfYf+/hkODZn3JBi AnBg== Sender: isar-users@googlegroups.com X-Gm-Message-State: AC+VfDxUjR/gLZbsv6LUdb31E2HHL+Uk+UXq7T7SUsOYr1+4hAd3z/F0 xQ4OzM+598jcGBalah928yw= X-Google-Smtp-Source: ACHHUZ5R06IBeMCQsakH76CSkfiZ3UBL/8XXeWP1v5DyTgaKSFLV8Y60lw5NGijP9A062HJTjSETGg== X-Received: by 2002:a05:6870:c786:b0:19a:f8e:f3e0 with SMTP id dy6-20020a056870c78600b0019a0f8ef3e0mr214379oab.9.1685084435140; 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-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 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; 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 X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_PASS 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-Original-Sender: ubely@ilbers.de X-Original-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 Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= 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):