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): From patchwork Fri May 26 07:00:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Uladzimir Bely X-Patchwork-Id: 2839 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-il1-f192.google.com (mail-il1-f192.google.com [209.85.166.192]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 34Q70fBE013367 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 26 May 2023 09:00:41 +0200 Received: by mail-il1-f192.google.com with SMTP id e9e14a558f8ab-33826fb9d0fsf2959735ab.0; 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=AOFti4YcfCLrubD1FK3908hBXwfHpYzgkyS5xyplNqYexfLKAUYnMC54W51iSB23H5 118Bzi13gsSnJLpivrswZjW7vCKFHd8E5ZUjnzzzP+exIAk9w2PKCFyDcY1NaHMAVYJT Y0UBKU7wMtyEpJIiTOasZsvh8Bl9Uvg+UWGmIXsQfl2qVMbzHEXfVL5JJL+3LGCTEgBB yFG/WmEw4LcStQn5Et2rBQgt24YXaqKUBuBWADSh24waSgtoZyFVFvub89DKmu6Y7LAU rSk9vBHwRDU19oiJH63t7hCk7wxdjh6F5dK4g91GqUIRVurh8Ok6CAR3eK9BrMM3JYDp +zWQ== 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=L0KURdjNNsqcZsjxkEXs2FqKou44V42/0t6glhtP3Fs=; b=pJa1eY28TcGcFRHUwImEqZSB2ocGtxZ7gNF9x7rvonzdt2nvjdRt/j/6SvPcwAkkc5 FndyostdXgecD86fdROZHlcH+pj2OzotZhBLLr8pjHYFULAsYh6CHvuJrU/8sMYZzwQl SKz93MvDGKAz7lhIZqo7ljYh9lAKkn+PO7K4OiB9pr7n8+Yrj4rNDaVAdOcRK8xc/cjh O+FsTBJEdBm2/3D8m6gt2MXdzhRjF8KqBM4HxVJ3ExQehHSpCM1s/Kl4TaWBhxrizq36 ikWHVqHq47Ap1Q3EdYyhhPSmNJwRakqyqhr9cHS9GIRQWVCoSlgzkGGFEWCAqUkOJI6q sCVA== 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=L0KURdjNNsqcZsjxkEXs2FqKou44V42/0t6glhtP3Fs=; b=OhOi7987uCl9WQuKrlFeHJOgpjs+YaKxOx8Mi3GMbFC0Kduql6SxxSooZyWjXGZPvx lM+Fp9y8j8JEpAztpGNppKGVhVH7gJSaC3ixkHd9Vzq/BR4f4IikyEPdf7TOwjVAUIEM JHY7SsoK0hV7GZCd68eF4DA0YhbmCBfNuhvgu4BNgYwrYBd/WU58Mnfm/BOzPHywvbZl s6RdqLVTRGVmARRvlfUTUhRHgYSexN6MlzEjuniflreN2US4fBKIc9+kT+L89JrEjsyA 87zvS2oNzAcuPTwIbCl2wuupobp/mxoyKuy2KeKeCL5KW2Hv9h6UFSH6aKQp+kEznpci NdbQ== 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=L0KURdjNNsqcZsjxkEXs2FqKou44V42/0t6glhtP3Fs=; b=by8l+A//9pjlV0qRgmM2P830XriPdPVHckqKAONlJg8vYk/SJrls7hvUz2NZSXnBGP 6hUs/6oYuA1OVG7FPpUs2wwzlxv4OxsDPqlbwl0d9Ckvw9+37KYmvWzohG/anyDv+e9X oJV5xZNryc2MDM8Of+wkMegg7xCh0figjDDuGFTLWhlQ/xmWIBr/WBEbrCqis2FeZZLj p/qhWAImg4zjPw+2OM01fEeutgugQ2lMU99fJ2tw9yKsr3SJTEoMJu5Q0FM/uABpyaSs 8/nOIO3dQDsQ6C1pE5RSb+XiYke5McfdO6Qvl9d23EzGiQuXC2HBrXrLpC2XcQe077PX zgEQ== Sender: isar-users@googlegroups.com X-Gm-Message-State: AC+VfDyCD4IixCuVeXjuNhc7vOc9aGXnbSarkOhX/27v9BNQoxKwJJnT wBolfDCSDKehoGPcBoyI9eA= X-Google-Smtp-Source: ACHHUZ5VA8nEsIGQx/8m5NCgHB+P17nxGF80jjwsXz9WANKKw3xzjk/XM22EyvV00xHHRWQitAdiZQ== X-Received: by 2002:a92:c10e:0:b0:334:c74c:43f9 with SMTP id p14-20020a92c10e000000b00334c74c43f9mr706173ile.13.1685084435488; Fri, 26 May 2023 00:00:35 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6e02:505:b0:336:1c16:1cd2 with SMTP id d5-20020a056e02050500b003361c161cd2ls347115ils.0.-pod-prod-03-us; Fri, 26 May 2023 00:00:35 -0700 (PDT) X-Received: by 2002:a5e:c749:0:b0:770:28ee:fee1 with SMTP id g9-20020a5ec749000000b0077028eefee1mr499600iop.7.1685084434946; 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=Nq8mCPVowcgvIcEsB4OcB2IIxWC8df2pfl9TlCXU6psd/TPOirCGE+54MwO8OIIIPI GfVqZOm4/5ekE0UV72T0eZptPC667yQ+9CUe+IPopK1DbSHgBRMEeL5wUJlbOXTK88mN L+ZifT/3WH4xuGf0OG77fGBO9V+iUu3I2RQm4J2yQDZkNGjhAgPN/dBRG4TurgwQ1XyS 60oYYRp0ZXZCf1dsKikbSCHFfDLdtcTHfnqq7GuFEKRyrvAYGFzL2nyM/KDa4gfZexdS c5IDVYST6Y+Aj/5eg/3jLq3/9kqu4TmYXtESAE04jW3uuMfJQVDb2qjylnGfIIhPcgIf dNAw== 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=Nx4RBd4LRIghv3uEJcpMcOY+F6q1xUNUfF5GpomZ4ys=; b=UND2xW6NCqfB7f5kfHexOKG9FdXgQOgvLhNZnCBVamDoe0wIsI02AOywo6gLHWo0na TRA7MocftSVT3olyLqCbgZW1J/piigKLKKuaQpa/DRQUD63LJWYyYGBSAnTAffJMFE0t F+DAYpVRw96KYhhBOCa/2JB6PQq5pfeV5EQC8euS4VFwfa/sQtHTfOcQ+0k+s40Q4JCz 94bGh6FopftwsGNyq5z+Rjyf7bBscYW7igTKQysqfYg2QhZD80hiTiY32t29Prf1JibS rYrzesCo4LHWYV7BiYyHdKbRwriSHB/DBTDf+wLY8x8irLQevYCMI9Js2BPljhYI3qJA u95w== 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 t22-20020a056602141600b007748ad04e82si273171iov.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 34Q70R3W013306 (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 02/12] ci_build.sh: Install python3-apt if not installed Date: Fri, 26 May 2023 09:00:17 +0200 Message-Id: <20230526070027.16890-3-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.9 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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?= This is mostly related to gitlab CI that migth use an image without preinstalled python3-apt. Also, make system python packages available in virtualenv. Signed-off-by: Uladzimir Bely --- scripts/ci_build.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/scripts/ci_build.sh b/scripts/ci_build.sh index 2fa5cccd..ff7c114a 100755 --- a/scripts/ci_build.sh +++ b/scripts/ci_build.sh @@ -19,7 +19,7 @@ if ! command -v avocado > /dev/null; then sudo apt-get update -qq sudo apt-get install -y virtualenv rm -rf /tmp/avocado_venv - virtualenv --python python3 /tmp/avocado_venv + virtualenv --python python3 /tmp/avocado_venv --system-site-packages # shellcheck source=/dev/null source /tmp/avocado_venv/bin/activate pip install avocado-framework==100.1 @@ -127,6 +127,12 @@ if echo "$TAGS" | grep -Fqive "-startvm"; then fi fi +# install python3-apt +if [ ! -f /usr/share/doc/python3-apt/copyright ]; then + sudo apt-get update -qq + sudo apt-get install -y python3-apt +fi + # Provide working path mkdir -p .config/avocado cat < .config/avocado/avocado.conf From patchwork Fri May 26 07:00:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Uladzimir Bely X-Patchwork-Id: 2841 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-oo1-f56.google.com (mail-oo1-f56.google.com [209.85.161.56]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 34Q70feD013370 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 26 May 2023 09:00:42 +0200 Received: by mail-oo1-f56.google.com with SMTP id 006d021491bc7-55533a40c75sf392434eaf.1; Fri, 26 May 2023 00:00:42 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1685084435; cv=pass; d=google.com; s=arc-20160816; b=P8TN1Q9E3RuLBEMnDpRUV0eqXcY7tsXWj6LbDpH71MUi+PyIOd3jfUqYx1QDFC2wZM lqerxwbvrx3W8rD7KXEYFcm/NNiXW72BJVTGPmXy034+n/I743nEQ+4ep+WHMODrngSU Xy+XlEUzgCPSBSvsYihlJAL80e9fAzwIC8UtIdhdsn6RLnGEfkEOUXjZYG7Q2yZAT4Bc N0i7JDPWLtYF3UG/iKKEGd/EzZmzK6L/jH9oLXeFPxYsBf14zJzuOZgKeLCOrxFpFO/b /nVWXq7nawFypIceMkpDAql3ai6gQIFHupp7nYxAJvx0s50CKkwOcct6f5AEU3Ymlxmu CV0w== 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=/F5yFsLHdtFhcO17Qq22V9uiemUHYDb7OUrHtrxCXlk=; b=RWOIJiAL6Xm6P1pIW6qd+PR4p0xlFZWhgWhtObDULuGJuRAgBgN/6e/bnD6ErSkyub Gswgbr7XT2DN9iPyRKmZH8XAvH7A0QyQA7xU4gSwD5NlDm+wvfEi2+BDl0/BbY5i99q6 ULmSvWCi2xGvCuybMPfO7yX45dds5SCrKmRgCF2sl7Sn3jz/oOC5FAQy1X3nYsIxnSFt fSwOxZqbCwjG2SCwKEtm2dC6fbSWFNVBBx40+qv8+Cng21SGAR4FOypig90u7bOqlabm OZqo7tI6FkEmQMjLAjk8fPva5ffOA9yDWm8I2RQF57/xd64HA49QVrPlkHn4vkmaLoeG XnmQ== 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=/F5yFsLHdtFhcO17Qq22V9uiemUHYDb7OUrHtrxCXlk=; b=Q21EmVyVLYKLKDsAE8z4z+yudl+5dQF/y2t4+KcDSgwyW6EQM8/7iHKt95u4sukLYZ 732mjF/wAtgcm6c1byKelz7ciF3Ix7OznMTGlsSvSW2hmWUNzTNCaN7XgZfyN7rkXwvb flMQvdZwyS3fG835LqrSzo9q6vX/6Kr5px9R5I6CifwaWCZJZPv0EESYmMcvlHkA8den +5rqSt9QG02Ro9LaoxvYCSUinng19KnRMWsISzRpdtGWGRsWs62rxl7TKQRe4cN1n08m zLjdOPvWFIpTGhGJ9rtGRC1QDcnBQFEQzf0RQFRb0MgsieSrhw2rEoykd7LJnJH2lpFd 2fqg== 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=/F5yFsLHdtFhcO17Qq22V9uiemUHYDb7OUrHtrxCXlk=; b=emCP67AHbnmqQWVVrx1iV/4gPiZBcORw26gKlMgUKvqrqBtHNOrVUstt+53QG/MhtL HpEX4HGOXAes8xTcnc1SagbKtQpBKAcsBiZNiFPL3W762HTUGs9kxyB0e+RjJ/h0LG6F Totuocyv40rZ0MTrG8+6cUkbck/kBmUb/feInMx86L55afCWGSIF8YEI5Czg7UNCX6WR Cfaoou6eWUY9ilRSpWw4wHiS7e49yBUwouiADQiGbZgt1gDjllNc1SAkVHOkWjo/G3lZ JGAVnvNOXfcd11dTaRMXPxLzft8Bzxx7sX5LYisETiOizA55P3gAB1pR4tq0+taRjHW5 +lwA== Sender: isar-users@googlegroups.com X-Gm-Message-State: AC+VfDyM2esQrnPKI5G6SQoLg76iT8gL6qkru+21yDgmDBHx6UJinmMN mk7IQ6OtIWDPlpM681Q5l+4= X-Google-Smtp-Source: ACHHUZ44/69wJWfsFgOVvpnZ6Hst+I1/Dw8s2SYW28Psz4mMss9PEmpUETt0D3/YAJS5ls5Uzalqwg== X-Received: by 2002:a05:6870:76a9:b0:192:74a0:2af2 with SMTP id dx41-20020a05687076a900b0019274a02af2mr244294oab.5.1685084435707; Fri, 26 May 2023 00:00:35 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6870:7728:b0:19a:2d51:c15e with SMTP id dw40-20020a056870772800b0019a2d51c15els618043oab.0.-pod-prod-07-us; Fri, 26 May 2023 00:00:35 -0700 (PDT) X-Received: by 2002:a05:6871:6ab0:b0:19e:8cd4:7148 with SMTP id zf48-20020a0568716ab000b0019e8cd47148mr366811oab.47.1685084435139; Fri, 26 May 2023 00:00:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685084435; cv=none; d=google.com; s=arc-20160816; b=nFyGtIyEaJB3pwmNveYQixpvF9rkXYlik+X/uctawTCfgb9gk/BfFlsIXm/7mLt25f 8D1AQksuWhnxRR/pjlBCzels23Iu7pxMwTtpsPN2q9E2nhMssoshpE9g75LC1frGlSVo ZrfJMgYtpSxL1LOjIbB3Ehim05zB2l/rU/tMX1z0fLYrR20Lr/6YbcXXS0tec/px0FUR /1DpN8CRtozUyjVSQxTxjus7+Jyus6lWeoy4Gxl5sdDn9NJf/MGJpqVffVZc3a57xZPx tkG93XXLFGvnlg9P5WjNbnBQTvjV7VKDm+q18uAhFRtALH5k5Xy43GlPIJVrm7LZkwum P14Q== 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=0AyqWdfy6IbFVwmBIFgYtKYqSLOM6iybr4pLaQTR6JY=; b=X69VfrNQzQBNjj+istWIfDhvekeVre93zBeXj6OIPdsPhYEWn5GmRAdk9ESX9AErt0 mJTytOkOd4Ba75rWoqPc7y57W791ALskwPop8sS59NVgmWVdIyItWvpEmx02cLVPXVxp n+lTegXNSLty1tgDbVcvx1wgmi5GE+VvDadbMK+GH8l0kH55lrfMIYLHuaUXwOX319Nb fMyB52WAJJ6dsR/3HQOexM+ZgY0zcUZY3Aqjscf9JXUdUz947+aqCG//I17gNdRfBFui 37zFwL2EAbSC51fvZzwRmgBsVclm2Z5S4kP4z+rem80VY2L+YMTLmJY1qM2E64ZoPTX6 zWOg== 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 d15-20020a4ad34f000000b005552377a831si256497oos.1.2023.05.26.00.00.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 26 May 2023 00:00:35 -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 34Q70R3X013306 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 26 May 2023 09:00:29 +0200 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v5 03/12] scripts: Add debrepo python script handling base-apt Date: Fri, 26 May 2023 09:00:18 +0200 Message-Id: <20230526070027.16890-4-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?= This is the main utility responsible for prefetching packages into local `base-apt` repo from external Debian mirrors. It uses python-apt module and requires some kind of minimal `rootfs` to work (let's call it "debrepo context"). Once initialized with `--init --workdir=`, it stores the initial configuration in `repo.opts` file inside the context and uses it at futher calls. In future, the logic `debrepo` script implements could be directly implemented inside bitbake classes. Signed-off-by: Uladzimir Bely --- scripts/debrepo | 443 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 443 insertions(+) create mode 100755 scripts/debrepo diff --git a/scripts/debrepo b/scripts/debrepo new file mode 100755 index 00000000..2a5e5b51 --- /dev/null +++ b/scripts/debrepo @@ -0,0 +1,443 @@ +#!/usr/bin/env python3 + +# This software is a part of ISAR. +# Copyright (C) 2022 ilbers GmbH + +import os +import sys +import fcntl + +import shutil +import subprocess +import getopt +import pickle +import urllib.parse + +import apt_pkg +import apt.progress.base + + +class DebRepo(object): + def __init__(self, workdir, cmdline_opts): + self.workdir = workdir + self.optsfile = self.workdir + "/repo.opts" + + # Set default values + self.distro = "debian" + + self.repo = self.workdir + "/repo/apt" + "/" + self.distro + self.repodb = self.workdir + "/repo/db" + "/" + self.distro + self.mirror = "http://deb.debian.org/debian" + self.arch = "amd64" + self.codename = "bullseye" + self.keydir = "/etc/apt/trusted.gpg.d" + self.check_gpg = True + self.isaraptdir = "" + + # Load stored opts + opts = self.load_opts() + print("stored opts: " + str(opts)) + + # Overwrite opts by cmdline_opts + for opt, arg in cmdline_opts.items(): + opts[opt] = arg + + print("all opts: " + str(opts)) + + # Replace by values passed in commandline + for opt, arg in opts.items(): + if opt == "mirror": + self.mirror = arg + if opt == "arch": + self.arch = arg + if opt == "distro": + self.distro = arg + if opt == "codename": + self.codename = arg + if opt == "keydir": + self.keydir = arg + if opt == "isaraptdir": + self.isaraptdir = arg + if opt == "check_gpg": + self.check_gpg = arg + + self.crossarch = self.arch + for opt, arg in opts.items(): + if opt == "crossarch": + self.crossarch = arg + + self.compatarch = "" + for opt, arg in opts.items(): + if opt == "compatarch": + self.compatarch = arg + + for opt, arg in opts.items(): + if opt == "repodir": + self.repo = arg + "/" + self.distro + if opt == "repodbdir": + self.repodb = arg + "/" + self.distro + + self.save_opts(opts) + + print("workdir: " + str(self.workdir)) + print("repo: " + str(self.repo)) + print("repodb: " + str(self.repodb)) + print("mirror: " + str(self.mirror)) + print("arch: " + str(self.arch)) + print("crossarch: " + str(self.crossarch)) + if self.compatarch: + print("compatarch: " + str(self.compatarch)) + print("distro: " + str(self.distro)) + print("codename: " + str(self.codename)) + print("keydir: " + str(self.keydir)) + print("isaraptdir: " + str(self.isaraptdir)) + print("check_gpg: " + str(self.check_gpg)) + + self.cache = None + self.depcache = None + self.sr = None + + def create_rootfs(self, aptsrcsfile): + if not os.path.exists(self.workdir + "/var/lib/dpkg"): + os.makedirs(self.workdir + "/var/lib/dpkg") + with open(self.workdir + "/var/lib/dpkg" + "/status", "w"): + pass + + if not os.path.exists(self.workdir + "/etc/apt/sources.list.d"): + os.makedirs(self.workdir + "/etc/apt/sources.list.d") + if os.path.exists(aptsrcsfile): + shutil.copy(aptsrcsfile, self.workdir + "/etc/apt/sources.list.d/bootstrap.list") + + if self.isaraptdir: + with open(self.workdir + "/etc/apt/sources.list.d/isar-apt.list", "w") as f: + f.write("deb [trusted=yes] file://" + self.isaraptdir + " isar main\n") + + if not os.path.exists(self.workdir + "/../apt_cache/" + self.distro + "-" + self.codename + "/archives/partial"): + os.makedirs(self.workdir + "/../apt_cache/" + self.distro + "-" + self.codename + "/archives/partial") + + if not os.path.exists(self.workdir + "/tmp"): + os.makedirs(self.workdir + "/tmp") + + def apt_config(self, init, crossbuild): + # Configure apt to work with empty directory + if not init and self.arch != self.crossarch: + apt_pkg.config["APT::Architectures::"] = self.crossarch + apt_pkg.config["APT::Architectures::"] = self.arch + + if not init and self.compatarch: + apt_pkg.config["APT::Architectures::"] = self.compatarch + + apt_pkg.config.set("APT::Architecture", self.arch) + + apt_pkg.config.set("Dir", self.workdir) + apt_pkg.config.set("Dir::Cache", self.workdir + "/../apt_cache/" + self.distro + "-" + self.codename) + apt_pkg.config.set("Dir::State::status", self.workdir + "/var/lib/dpkg/status") + + apt_pkg.config.set("APT::Install-Recommends", "0") + apt_pkg.config.set("APT::Install-Suggests", "0") + + # Use host keys for authentification + # apt_pkg.config.set("Dir::Etc::Trusted", "/etc/apt/trusted.gpg") + # apt_pkg.config.set("Dir::Etc::TrustedParts", "/etc/apt/trusted.gpg.d") + apt_pkg.config.set("Dir::Etc::TrustedParts", self.keydir) + + # Allow using repositories without keys + if not self.check_gpg: + apt_pkg.config.set("Acquire::AllowInsecureRepositories", "1") + + def mark_essential(self): + for pkg in self.cache.packages: + if pkg.architecture == self.arch: + if pkg.essential: + self.depcache.mark_install(pkg) + + def mark_by_prio(self, priority): + for pkg in self.cache.packages: + if pkg.architecture == self.arch: + ver = self.depcache.get_candidate_ver(pkg) + if ver and ver.priority <= priority: + self.depcache.mark_install(pkg) + + def mark_pkg(self, pkgname, crossbuild): + if pkgname in self.cache: + pkg = self.cache[pkgname] + + if not crossbuild or ':' in pkgname or len(pkg.version_list) == 0: + if pkg.has_provides and not pkg.has_versions: + print("pkgname is virtual package, selecting best provide") + # Select first provide + pkg_provide = pkg.provides_list[0][2] + # Find better provide with higher version + for provide in pkg.provides_list: + if apt_pkg.version_compare(provide[2].ver_str, pkg_provide.ver_str) > 0: + pkg_provide = provide[2] + self.depcache.mark_install(pkg_provide.parent_pkg) + else: + self.depcache.mark_install(pkg) + else: + version = pkg.version_list[0] + if version.arch == "all": + self.depcache.mark_install(pkg) + else: + if version.multi_arch == version.MULTI_ARCH_FOREIGN: + if (pkgname, self.arch) in self.cache: + nativepkg = self.cache[pkgname, self.arch] + self.depcache.mark_install(nativepkg) + else: + if (pkgname, self.crossarch) in self.cache: + crosspkg = self.cache[pkgname, self.crossarch] + self.depcache.mark_install(crosspkg) + + def mark_list(self, pkglist, crossbuild): + if pkglist: + for pkgname in pkglist: + self.mark_pkg(pkgname, crossbuild) + + def handle_deb(self, item): + lockfd = open(self.repo + '/../repo.lock', 'w') + fcntl.flock(lockfd,fcntl.LOCK_EX) + subprocess.run([ + "reprepro", + "--dbdir", self.repodb, + "--outdir", self.repo, + "--confdir", self.repo + "/conf", + "-C", "main", + "includedeb", + self.codename, + item.destfile + ]) + lockfd.close() + + def handle_repo(self, fetcher): + lockfd = open(self.workdir + "/../apt_cache/" + self.distro + "-" + self.codename + ".lock", "w") + fcntl.flock(lockfd,fcntl.LOCK_EX) + fetcher.run() + lockfd.close() + for item in fetcher.items: + if item.status == item.STAT_ERROR: + print("Some error ocured: '%s'" % item.error_text) + pass + else: + self.handle_deb(item) + + def get_filename(self, uri): + path = urllib.parse.urlparse(uri).path + unquoted_path = urllib.parse.unquote(path) + basename = os.path.basename(unquoted_path) + return basename + + def download_file(self, uri): + filename = self.get_filename(uri) + subprocess.run([ + "wget", + "-H", + "--timeout=30", + "--tries=3", + "-q", + uri, + "-O", + self.workdir + "/tmp/" + filename + ]) + + def handle_dsc(self, uri): + filename = self.get_filename(uri) + lockfd = open(self.repo + '/../repo.lock', 'w') + fcntl.flock(lockfd,fcntl.LOCK_EX) + subprocess.run([ + "reprepro", + "--dbdir", self.repodb, + "--outdir", self.repo, + "--confdir", self.repo + "/conf", + "-C", "main", + "-S", "-", "-P" "source", + "--delete", + "includedsc", + self.codename, + os.path.realpath(self.workdir + "/tmp/" + filename) + ]) + lockfd.close() + + def handle_src_list(self, pkgs): + if pkgs: + for pkg in pkgs: + pkgname=pkg + pkgver="" + if '=' in pkg: + pkgname = pkg.split("=")[0] + pkgver = pkg.split("=")[1] + + self.sr.restart() + while self.sr.lookup(pkgname): + if pkgver and pkgver != self.sr.version: + continue + + for sr_file in self.sr.files: + print(self.sr.index.archive_uri(sr_file[2])) + self.download_file(self.sr.index.archive_uri(sr_file[2])) + + dsc_uri = self.sr.index.archive_uri(self.sr.files[0][2]) + self.handle_dsc(dsc_uri) + break + + def apt_run(self, init, srcmode, pkgs, controlfile, crossbuild): + apt_pkg.init() + + sources = apt_pkg.SourceList() + sources.read_main_list() + + progress = apt.progress.text.AcquireProgress() + + self.cache = apt_pkg.Cache() + self.cache.update(progress, sources) + self.cache = apt_pkg.Cache() + + self.depcache = apt_pkg.DepCache(self.cache) + self.sr = apt_pkg.SourceRecords() + + if init: + self.mark_essential() + # 1(required), 2(important), 3(standard), 4(optional), 5(extra) + self.mark_by_prio(1) + + if srcmode: + self.handle_src_list(pkgs) + else: + self.mark_list(pkgs, crossbuild) + + if controlfile: + fobj = open(controlfile, "r") + + try: + tagfile = apt_pkg.TagFile(fobj) + while tagfile.step() == 1: + deps = tagfile.section.get("Build-Depends", "") + # Remove extra commas and spaces - apt_pkg.parse_depends doesnt like + # lines like ", device-tree-compiler" + deps = ', '.join([s.strip() for s in deps.split(',') if s.strip()]) + print("parsed deps: " + str(deps)) + for item in apt_pkg.parse_depends(deps, False): + pkgname = item[0][0] + self.mark_pkg(pkgname, crossbuild) + + finally: + fobj.close() + + if init or not srcmode: + fetcher = apt_pkg.Acquire(progress) + pm = apt_pkg.PackageManager(self.depcache) + + recs = apt_pkg.PackageRecords(self.cache) + pm.get_archives(fetcher, sources, recs) + + self.handle_repo(fetcher) + + def load_opts(self): + params = {} + if os.path.isfile(self.optsfile): + with open(self.optsfile, 'rb') as file: + data = file.read() + if data: + params = pickle.loads(data) + + return params + + def save_opts(self, opts): + file = open(self.optsfile, 'wb') + pickle.dump(opts, file) + file.close() + + +class DebRepoArgs(object): + def __init__(self): + self.workdir = "" + self.init = False + self.srcmode = False + self.controlfile = "" + self.aptsrcsfile = "" + self.crossbuild = False + + self.opts = {} + self.pkgs = [] + + try: + opts, args = getopt.getopt(sys.argv[1:], "", [ + "init", + "srcmode", + "workdir=", + "repodir=", + "repodbdir=", + "mirror=", + "arch=", + "crossarch=", + "compatarch=", + "distro=", + "codename=", + "keydir=", + "isaraptdir=", + "no-check-gpg", + "controlfile=", + "aptsrcsfile=", + "crossbuild" + ]) + except getopt.GetoptError as msg: + print("Error: " + str(msg)) + sys.exit(1) + + for opt, arg in opts: + if opt in ("--workdir"): + self.workdir = arg + if opt in ("--init"): + self.init = True + if opt in ("--srcmode"): + self.srcmode = True + if opt in ("--controlfile"): + self.controlfile = arg + if opt in ("--aptsrcsfile"): + self.aptsrcsfile = arg + if opt in ("--crossbuild"): + self.crossbuild = True + + if opt in ("--repodir", + "--repodbdir", + "--mirror", + "--arch", + "--crossarch", + "--compatarch", + "--distro", + "--codename", + "--keydir", + "--isaraptdir", + "--controlfile", + ): + self.opts[opt[2:]] = arg + if opt in ("--no-check-gpg"): + self.opts['check_gpg'] = False + + if not self.workdir: + print("Error: workdir is not specified") + sys.exit(1) + + self.pkgs = args + + +def main(): + args = DebRepoArgs() + + if not (args.init or args.pkgs or args.controlfile): + print("Nothing to do") + sys.exit(0) + + if not os.path.exists(args.workdir): + os.makedirs(args.workdir) + + debrepo = DebRepo(args.workdir, args.opts) + + if (args.init): + debrepo.create_rootfs(args.aptsrcsfile) + + debrepo.apt_config(args.init, args.crossbuild) + debrepo.apt_run(args.init, args.srcmode, args.pkgs, args.controlfile, args.crossbuild) + + +if __name__ == "__main__": + main() From patchwork Fri May 26 07:00:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Uladzimir Bely X-Patchwork-Id: 2840 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-qv1-f55.google.com (mail-qv1-f55.google.com [209.85.219.55]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 34Q70fJf013371 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 26 May 2023 09:00:42 +0200 Received: by mail-qv1-f55.google.com with SMTP id 6a1803df08f44-62609400a3bsf4596436d6.2; Fri, 26 May 2023 00:00:42 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1685084436; cv=pass; d=google.com; s=arc-20160816; b=WaxBwSpiajTuMZMEQM71Hkc+EOzkLSIhMvyYfosZ3RK/qMtjJGrM8S3hzmSk4QfoWQ 0MZioDL6Ut6QOQT/8CMDYhgfUvZAWoIzD7NS3QYNtBB+6y7tSiIDrGdn9cASXY8rJLNj Nyy6347uG8LUBhULPzMBTeXQIU/Bc6sjcllwrtaZHhm+wL/lo9EKbASCkogqlTEtnu++ zMVS06a/8sT0SYWK0apbLGE/vYUFcSr5528lua5bZAKIy3toWe6ZZ0gSIqWXUPMU9nWj 5pIyF/SVdcI3OikANoeBeFz/Q+BjrnwzHHEB1JjehO/51G9f4VAKXxh9R0F7ClKVedu9 ZvHg== 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=hUOf3I3VL/JQdVkhKGy/sgR+lLdYI8dmsR1YBh4WFjo=; b=FGimZn37ySx+WONL5/IKhxRWetCVA5F8UQXxEmbTOdDtXA8nmzD3+JKnDN6W1pgvNS uqz7eCM987i9EWggTe/qkvWbLnDwgeCvHkWmwh7AgvG0eamJthJAbE6GdeHYbPgcKolI gTiP5KYqicncWkrqN6bPwtL9vNASleLKVem7oi5iwRM4zWUN3pw2XP8tRHxZkDSDH+SN 8lbgrikqkWU4JT287nA/xxsrgpfd+Tcv7qxe1Ks0/X5DhFM6BvZJfso+Mq0GRRcPK0X9 9i3yZrB9SZEJqGnQm+4Q0oFG5E/MiSG5T8kdQeDFvX+KSvdSIJrdjDczVvsvkIADKiYK 4Cqg== 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=1685084436; x=1687676436; 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=hUOf3I3VL/JQdVkhKGy/sgR+lLdYI8dmsR1YBh4WFjo=; b=jT1Qt9IqR5+S7mvqJpQW/JYUO8dC9OL+8ShWDAbp9hORivYtTfLXHbRgIr26JCX2Jy lqbaSNnZveKquSMHrKA/rePO0ZGpJD0mdNfC6mDJXR5JcnF1IXkco18quVxuYsNcavBA NOoP6DMthmo9ACP1TesBio/TeE27XTrNvGWuolAZZBR2xbPd/awIh3gXDe+yzBJcLPQe RoeC4qsqH3doZIvJDPGjnUQMZCoJNQDf6+Clgwf/w4UuuF/UMylUDwqusWw7wD9uCj4o hAzTXogunwo1dmPkrESZzwpVKrS5UBAMI5ORlQMbGDj2g7naUH6RmsfrUsgU8B1zHAme Zr/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685084436; x=1687676436; 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=hUOf3I3VL/JQdVkhKGy/sgR+lLdYI8dmsR1YBh4WFjo=; b=ME7iqu/AeiSywP03jBSv8+3fE0T+umPoAOypfz0SwcsVknK3MWgrdKqV8TAehmcI+U fdAmg+XktyVTR0n0bvlHedssfIYA7pX9+l3iveKQ/fCx/8/ivT+BdnupEnLhLpFLOnLe +V2Pq1UMJewy7DdG+swFWnx7kMTM1k2cSg1j0LuZVXQy+aTt+qjf+XTjOaLVO42eMxfb MHBBx97WsjIJDoiL/fw07VECguMqFyOG2Ig2D9k7vnoKxKxeEsW8oC+uixDmD01bYuQe j/GhP/unZ+sn+QRYzyVCVtTr5vrm+POZJSQBu4+2ZcId8SctGDXd+E+ifJnSJpNB2LD/ atng== Sender: isar-users@googlegroups.com X-Gm-Message-State: AC+VfDxzXsvX708MeLXdSGOPHSywXfJnF4DIdPAI7yPO78UfCRIaoOQx o8Bf9OccfDyvoYyvi7F/4vA= X-Google-Smtp-Source: ACHHUZ6ZHFj2dZB2ESQNRGi81j1pVz/HOVkjkQgxo4AIDa6f7CpiOpd3KyBBX0+jZSivFxhoFhbPOw== X-Received: by 2002:ad4:5a14:0:b0:61b:5c7c:af11 with SMTP id ei20-20020ad45a14000000b0061b5c7caf11mr202864qvb.7.1685084436393; Fri, 26 May 2023 00:00:36 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ac8:74d5:0:b0:3f6:c08f:35fe with SMTP id j21-20020ac874d5000000b003f6c08f35fels514762qtr.1.-pod-prod-09-us; Fri, 26 May 2023 00:00:35 -0700 (PDT) X-Received: by 2002:a05:620a:40d2:b0:75b:23a1:3638 with SMTP id g18-20020a05620a40d200b0075b23a13638mr1219122qko.73.1685084435716; Fri, 26 May 2023 00:00:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685084435; cv=none; d=google.com; s=arc-20160816; b=pAgtXlSw1gcLtI3cWrThp60bvy7tDGMtVOySzUPlsgHHS6L5DsUYhvaBZVfmyb8bTq lNTpE8OwGcxVS8WnNIh64hexVK1mDIza3TsLnAuamlD0QTbUoVCqyISp7ilghn4O/ZBN cOp5O4Or3CntpYfH/wxsC5z0xR2PBmsRAKOqLAQXvfYsVqtMusCRPmYTncoYKUCe9hIL 8TlF6dlNuNgCgBifr3JEXmGzL/yp+Qr6Bptd/56jvMazzcGi9/tMrlQcHPrOIP3Zw8ko C0UUeQHAhbADQH/pvpvygNnTVCSXUpJRe+wUSe4bWi4l4/Hj6lMu57tZkf1FB/L8QfXG C0HA== 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=j+iOBgE8VBlctDpx5IPnXi+dmgv0xdr2xghgFqSNDFU=; b=q4gmoWNtrQw/Xf8to5KJrqn4yjzr/UMpTIpzplpDQbLmOlZH0XEx5tROLzOnERoinI iAZI7caYHBZMD6IWoj/gBFk7yMUDDvXvzWMEGDL9gao3YIgO1bQtB1UQFLNQHRvJ9GjV Z/93Y1bYwAv8DOLphAz0Ck1PoRGqB1W7q9/fTTotA3zM+yKR36J1ZqCRB74Rj5vA5QNR MJHrLmYPs+bOCvPgENoHMDce3VfCwHz6NTPAcvJ7T7Q8EZ8PGGCWwipU14Lex7FXTec4 nUM5ifUtsOqbj+RfRnASqRDeTj2sb+KLuzDrJgyQu9CfSdYQlqqBmQQTBYe8+GiTSEup gFsw== 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 a21-20020a05620a439500b0075b38daac2asi262608qkp.6.2023.05.26.00.00.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 26 May 2023 00:00:35 -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 34Q70R3Y013306 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 26 May 2023 09:00:29 +0200 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v5 04/12] meta: Add debrepo bbclass handling base-apt prefetching Date: Fri, 26 May 2023 09:00:19 +0200 Message-Id: <20230526070027.16890-5-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.9 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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?= This class uses 'scripts/debrepo' python script to prefetch given packages or sources to local base-apt repository. Signed-off-by: Uladzimir Bely --- meta/classes/debrepo.bbclass | 86 ++++++++++++++++++++++++++++++++++++ meta/conf/bitbake.conf | 5 +++ 2 files changed, 91 insertions(+) create mode 100644 meta/classes/debrepo.bbclass diff --git a/meta/classes/debrepo.bbclass b/meta/classes/debrepo.bbclass new file mode 100644 index 00000000..8f2a3215 --- /dev/null +++ b/meta/classes/debrepo.bbclass @@ -0,0 +1,86 @@ +DEBREPO_WORKDIR ?= "${DEBREPO_TARGET_DIR}" + +debrepo_update_apt_source_list() { + if [ "${ISAR_PREFETCH_BASE_APT}" != "1" ]; then + return + fi + + chroot_dir=${1} + apt_list=${2} + + flock -x "${REPO_BASE_DIR}/repo.lock" -c " + sudo -E chroot ${chroot_dir} /usr/bin/apt-get update \ + -o Dir::Etc::SourceList=\"sources.list.d/${apt_list}.list\" \ + -o Dir::Etc::SourceParts=\"-\" \ + -o APT::Get::List-Cleanup=\"0\" + " +} + +debrepo_add_packages() { + if [ "${ISAR_PREFETCH_BASE_APT}" != "1" ]; then + return + fi + + if [ "${ISAR_USE_CACHED_BASE_REPO}" = "1" ]; then + return + fi + + args="" + if [ "${1}" = "--srcmode" ]; then + args="${args} --srcmode" + shift + fi + + workdir="${1}" + pkgs="${2}" + + if [ -n "${GNUPGHOME}" ]; then + export GNUPGHOME="${GNUPGHOME}" + fi + + flock -x "${workdir}/repo.lock" -c " + ${SCRIPTSDIR}/debrepo \ + ${args} \ + --workdir=\"${workdir}\" \ + ${pkgs} + " +} + +debrepo_handle_controlfile() { + if [ "${ISAR_PREFETCH_BASE_APT}" != "1" ]; then + return + fi + + if [ "${ISAR_USE_CACHED_BASE_REPO}" = "1" ]; then + return + fi + + control_file="${1}" + + args="" + pkgs="" + + build_arch=${DISTRO_ARCH} + if [ "${ISAR_CROSS_COMPILE}" = "1" ]; then + build_arch=${HOST_ARCH} + fi + if [ "${PACKAGE_ARCH}" != "${build_arch}" ]; then + args="--crossbuild" + pkgs="${pkgs} crossbuild-essential-${PACKAGE_ARCH}:${build_arch}" + pkgs="${pkgs} dose-distcheck:${build_arch}" + pkgs="${pkgs} libc-dev:${PACKAGE_ARCH}" + pkgs="${pkgs} libstdc++-dev:${PACKAGE_ARCH}" + fi + + if [ -n "${GNUPGHOME}" ]; then + export GNUPGHOME="${GNUPGHOME}" + fi + + flock -x "${DEBREPO_WORKDIR}/repo.lock" -c " + ${SCRIPTSDIR}/debrepo \ + --workdir=\"${DEBREPO_WORKDIR}\" \ + --controlfile=\"${control_file}\" \ + ${args} \ + ${pkgs} + " +} diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 89b3e6a3..91f81bd4 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -71,6 +71,11 @@ KERNEL_FILE:mipsel ?= "vmlinux" KERNEL_FILE:riscv64 ?= "vmlinux" KERNEL_FILE:arm64 ?= "vmlinux" +# debrepo config +DEBREPO_DIR = "${TOPDIR}/debrepo" +DEBREPO_HOST_DIR = "${DEBREPO_DIR}/${HOST_DISTRO}-${HOST_ARCH}_${DISTRO}-${DISTRO_ARCH}" +DEBREPO_TARGET_DIR = "${DEBREPO_DIR}/${DISTRO}-${DISTRO_ARCH}" + OVERRIDES = "${PACKAGE_ARCH}:${MACHINE}:${DISTRO}:${BASE_DISTRO_CODENAME}:forcevariable" FILESOVERRIDES = "${PACKAGE_ARCH}:${MACHINE}" From patchwork Fri May 26 07:00:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Uladzimir Bely X-Patchwork-Id: 2842 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:45 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-qk1-f183.google.com (mail-qk1-f183.google.com [209.85.222.183]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 34Q70gv1013378 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 26 May 2023 09:00:42 +0200 Received: by mail-qk1-f183.google.com with SMTP id af79cd13be357-75b67a4f16asf34109685a.1; Fri, 26 May 2023 00:00:42 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1685084436; cv=pass; d=google.com; s=arc-20160816; b=rGcrpSihj3WeekacLBMDeZ61B4XxKrJyMyvE4Dbu9fiYbaMZdrZv0NHj3WHl41IqJi yU0XiEQqDnxaYIdT0MFDt/iq4FjtL5IlzD8nnLhYbFIoE7OvykMy7yUqkVVs+rzLlxkb SChsa7I5vVNYFqRJJJvEfD93/EUk3HQ2z/SG17gG/xXfOHLcKNPiB+mb9QoGD4ILC4pg LqRhgjAP8F1FXEEaNEzPl0VjcHnzomaboin158qjaunlYmdZF/UGW83ttPkHqPS8IoY4 2nJ39xnUhll7DhZHd9OQFzi6Yppk10H7p2/w5thxpEpor/waGXmMh/Nn9QHwG/NR/HmZ eaLQ== 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=tIfd4IzOTYC6gWXv/obpyZsJZobmRwbFpIxYgWs2CdA=; b=nkQdJkTt/uLuUngLtHyiEWwwUpQar16+QuubyGAuUXThDgS6prSZ1ZObEW3PJl0t63 8Td+JbeAYuJVObeaLgtg4jGQMhBJW6hclOiELxU0AYhiHKfj6raulndOZBbYF1u9Gggb VyU3S1b4IzYJavKswk9x3MOa8ztiBHuhh1YP8QQIVn7e+O33aLVZzOuqjlzTedZCQaO0 YuOuvDOJFaJOLClAn31qzJdp9SHYnsmjqkmb/CxOvFx4hXICA1DgFI1Hf1X8tVgS+yrV EzcJRE0aHQ/J4oDiMaQVG6ikvlk/+VZsSnrpeX1MMVEfv+W92IiDC//9sJ60YjyCmCg2 D5eA== 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=1685084436; x=1687676436; 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=tIfd4IzOTYC6gWXv/obpyZsJZobmRwbFpIxYgWs2CdA=; b=XUT7dgwBwAX64dYMb/XvpYRxu6KP3zuEusserSnuWg4ldfaGyKz/8t/AQBj5jEz8D7 N1v45FgoFKxdh1MbqZbwHwD/wELWpj8lwSplaoqholCFgog27hLhCkRTX/KqUJZN3/MK 0CFQ42bxD3dO8VWIzcIpYo4dBqBUCgEFsW0EfQzG4huCZFDn1Jm4eKAw26ZbA2UcZVZm O0bhoHoGyAX3XUFaIVwsa6dCJ1HU3SD1+m5xCGD5YYj+sva5gYZKjw17iKDI/O6FmbvH xVrmkweupJidcb6Q5y+bbIw1T+TeDZeTkCnt29CV1armsFIk3ObnUNVegjdFjL9c/3MR Hplg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685084436; x=1687676436; 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=tIfd4IzOTYC6gWXv/obpyZsJZobmRwbFpIxYgWs2CdA=; b=PjBKB7KUMrlmFvBTahApBiIb1SgTrKlPItTwYvUL8tNW+5rTxCHj4ED4uq6TMY7oZ/ cbHlqNYucYPIcZ7Izdw6CrKw6tQc13S44TOwHkrl1/nSg2M9EYYsLPkPn5detjTUjwSm qnRFhGq57UQO0ynAgBBWpoqnQW52Xcw9HeWkPl6N8yzzBlrMpRsYE2sS3vMNqKMrpUvI Vfmfh1waJKmUorGYa8F5GeVk2FJmBn1QLszwbM3CdFC7vlFplOr3Zenwaksc+yV0D9J4 BE6D0dasiDIDiEww9VA6Rz6HQX3FnpBSimEpYaB0omFazNJJl0ApCGY+WmURameSCb8j dkFA== Sender: isar-users@googlegroups.com X-Gm-Message-State: AC+VfDy5GiXh934GKEk5Bsr6L6Eeldxrk9U+dy+2we5bKjf9vCiPR9vc ULA4i43TbFZ9Grr++qqQV5E= X-Google-Smtp-Source: ACHHUZ4O46f7QSjOj7o6Gfg/WUoFbPI12DSqAtkKC07n/cVb7G45L+wJG1RnsFE9+8vGs20m3bjamQ== X-Received: by 2002:a05:620a:370c:b0:75c:b19b:4fcd with SMTP id de12-20020a05620a370c00b0075cb19b4fcdmr326321qkb.9.1685084436658; Fri, 26 May 2023 00:00:36 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ac8:4904:0:b0:3f7:9487:af30 with SMTP id e4-20020ac84904000000b003f79487af30ls2665848qtq.1.-pod-prod-07-us; Fri, 26 May 2023 00:00:36 -0700 (PDT) X-Received: by 2002:ac8:5804:0:b0:3f5:1390:9449 with SMTP id g4-20020ac85804000000b003f513909449mr711324qtg.52.1685084436000; Fri, 26 May 2023 00:00:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685084435; cv=none; d=google.com; s=arc-20160816; b=BUhZuxlYElgIMp+ZTohgXNqZAOac7WIfn0q32saVTpwBHluhLH0mJmcM9rsN9Wtoxq pGuWOLbYbUieCkhxhzggN29JkyNL3m7foNv+MyAoDTMWiEbCQNbdyYDibA7Er/MMXuYX xBD2Zoa8BX9SMuuC+E+sD5o/1R+7grL7oT+cH6FJIBVDBxQFDNAbR7/jkQq4XWbu1Kwl T6Nd992KuS/d/NyrCe4o0yr9r7c6WAFP71whdnU/aFkkRy4Y/C4iawdoZ9m9YjBPG0QW l6KFMGp7kf+8S6OzHE7pgP6cQsSoDbywxC8+o1ywwM25RXdqE9UBgLEMhDvVJnW9FBhv UnMw== 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=Zwa58OX0EU6QtwFfQ5vfYUYl3v0KSEJJqcqiTLJFSZQ=; b=IKh4R1B/php1eZTtXSjWyTLAOkENNK1C+K3A8+OJCDl7tKhucyNz63qpaC1ANMAfQM saAnsOJvZ+YLJgmdrzCCMgLEy6JCQ92nDOL1I7DixozMG9c+vwVXiWi+kNEwm62bpOj/ 0NvOVUDOL29EinLuDI7sd5DRDoQtJ3Zmu7929y9JDTiRopU751jVZ/3osrEKbogP4rIk hGpyadJu6ln6ME5UiS3w9BeiEPwjkj1PfQA5P9faDvyfgIoX7JI+4b8XS6TV4XE7rOVj vWCPPWOVSjktQHj1twpiUGeALmLaKfqRzcIWDzrHZIHWcEC/z1GvSz3JKUdXQbDWXg5h t+Lw== 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 fx14-20020a05622a4ace00b003f6a957b6b7si336310qtb.4.2023.05.26.00.00.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 26 May 2023 00:00:35 -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 34Q70R3Z013306 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 26 May 2023 09:00:29 +0200 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v5 05/12] meta: Always use base-apt repo in local mode Date: Fri, 26 May 2023 09:00:20 +0200 Message-Id: <20230526070027.16890-6-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.9 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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?= This means only local URLs in apt sources.list* are present during the build. Any installation of packages is done from local base-apt. So, base-apt should be always mounted in *_do_mounts since now. Signed-off-by: Uladzimir Bely --- meta/classes/buildchroot.bbclass | 5 +++-- meta/classes/rootfs.bbclass | 5 +++-- .../isar-bootstrap/isar-bootstrap.inc | 12 +++++++---- meta/recipes-devtools/base-apt/base-apt.bb | 21 ++++++++++++------- 4 files changed, 28 insertions(+), 15 deletions(-) diff --git a/meta/classes/buildchroot.bbclass b/meta/classes/buildchroot.bbclass index e4a7a571..947529b0 100644 --- a/meta/classes/buildchroot.bbclass +++ b/meta/classes/buildchroot.bbclass @@ -38,8 +38,9 @@ buildchroot_do_mounts() { mount --rbind /sys '${BUILDCHROOT_DIR}/sys' mount --make-rslave '${BUILDCHROOT_DIR}/sys' - # Mount base-apt if 'ISAR_USE_CACHED_BASE_REPO' is set - if [ "${@repr(bb.utils.to_boolean(d.getVar('ISAR_USE_CACHED_BASE_REPO')))}" = 'True' ] + # Mount base-apt if 'ISAR_PREFETCH_BASE_APT' or 'ISAR_USE_CACHED_BASE_REPO' is set + if [ "${@repr(bb.utils.to_boolean(d.getVar('ISAR_PREFETCH_BASE_APT')))}" = 'True' ] || \ + [ "${@repr(bb.utils.to_boolean(d.getVar('ISAR_USE_CACHED_BASE_REPO')))}" = 'True' ] then mkdir -p '${BUILDCHROOT_DIR}/base-apt' mountpoint -q '${BUILDCHROOT_DIR}/base-apt' || \ diff --git a/meta/classes/rootfs.bbclass b/meta/classes/rootfs.bbclass index 22449d71..cedde239 100644 --- a/meta/classes/rootfs.bbclass +++ b/meta/classes/rootfs.bbclass @@ -54,8 +54,9 @@ rootfs_do_mounts() { mount --bind '${REPO_ISAR_DIR}/${DISTRO}' '${ROOTFSDIR}/isar-apt' fi - # Mount base-apt if 'ISAR_USE_CACHED_BASE_REPO' is set - if [ "${@repr(bb.utils.to_boolean(d.getVar('ISAR_USE_CACHED_BASE_REPO')))}" = 'True' ] + # Mount base-apt if 'ISAR_PREFETCH_BASE_APT' or 'ISAR_USE_CACHED_BASE_REPO' is set + if [ "${@repr(bb.utils.to_boolean(d.getVar('ISAR_PREFETCH_BASE_APT')))}" = 'True' ] || \ + [ "${@repr(bb.utils.to_boolean(d.getVar('ISAR_USE_CACHED_BASE_REPO')))}" = 'True' ] then mkdir -p '${ROOTFSDIR}/base-apt' mountpoint -q '${ROOTFSDIR}/base-apt' || \ diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc index b94ae0bd..0cfe82ab 100644 --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc @@ -42,7 +42,8 @@ python () { # installation afterwards. However, debootstrap will include the key into # the rootfs automatically thus the right place is distro_bootstrap_keys. - if bb.utils.to_boolean(d.getVar('ISAR_USE_CACHED_BASE_REPO')): + if bb.utils.to_boolean(d.getVar('ISAR_PREFETCH_BASE_APT')) or \ + bb.utils.to_boolean(d.getVar('ISAR_USE_CACHED_BASE_REPO')) : own_pub_key = d.getVar("BASE_REPO_KEY") if own_pub_key: distro_bootstrap_keys += own_pub_key.split() @@ -110,7 +111,8 @@ def parse_aptsources_list_line(source_list_line): def get_apt_source_mirror(d, aptsources_entry_list): import re - if bb.utils.to_boolean(d.getVar('ISAR_USE_CACHED_BASE_REPO')): + if bb.utils.to_boolean(d.getVar('ISAR_PREFETCH_BASE_APT')) or \ + bb.utils.to_boolean(d.getVar('ISAR_USE_CACHED_BASE_REPO')) : premirrors = "\S* file://${REPO_BASE_DIR}/${BOOTSTRAP_BASE_DISTRO}\n" else: premirrors = d.getVar('DISTRO_APT_PREMIRRORS') or "" @@ -286,7 +288,8 @@ do_bootstrap() { if [ -f "${DISTRO_BOOTSTRAP_KEYRING}" ]; then debootstrap_args="$debootstrap_args --keyring=${DISTRO_BOOTSTRAP_KEYRING}" fi - if [ "${ISAR_USE_CACHED_BASE_REPO}" = "1" -a -z "${BASE_REPO_KEY}" ]; then + if [ "${ISAR_PREFETCH_BASE_APT}" = "1" -a -z "${BASE_REPO_KEY}" ] || \ + [ "${ISAR_USE_CACHED_BASE_REPO}" = "1" -a -z "${BASE_REPO_KEY}" ]; then debootstrap_args="$debootstrap_args --no-check-gpg" fi E="${@ isar_export_proxies(d)}" @@ -313,7 +316,8 @@ do_bootstrap() { install -v -m644 "${APTPREFS}" \ "${ROOTFSDIR}/etc/apt/preferences.d/bootstrap" mkdir -p "${ROOTFSDIR}/etc/apt/sources.list.d" - if [ "${ISAR_USE_CACHED_BASE_REPO}" = "1" ]; then + if [ "${ISAR_PREFETCH_BASE_APT}" = "1" ] || \ + [ "${ISAR_USE_CACHED_BASE_REPO}" = "1" ]; then line="file:///base-apt/${BOOTSTRAP_BASE_DISTRO} ${BASE_DISTRO_CODENAME} main" if [ -z "${BASE_REPO_KEY}" ]; then line="[trusted=yes] ${line}" diff --git a/meta/recipes-devtools/base-apt/base-apt.bb b/meta/recipes-devtools/base-apt/base-apt.bb index ea885fe6..e62958d1 100644 --- a/meta/recipes-devtools/base-apt/base-apt.bb +++ b/meta/recipes-devtools/base-apt/base-apt.bb @@ -57,9 +57,12 @@ repo() { "${BASE_DISTRO_CODENAME}" \ "${WORKDIR}/distributions.in" \ "${KEYFILES}" - populate_base_apt "${BASE_DISTRO}" - repo_sanity_test "${REPO_BASE_DIR}"/"${BASE_DISTRO}" \ - "${REPO_BASE_DB_DIR}"/"${BASE_DISTRO}" + if [ "${ISAR_USE_CACHED_BASE_REPO}" = "1" ] && \ + [ "${ISAR_PREFETCH_BASE_APT}" != "1" ]; then + populate_base_apt "${BASE_DISTRO}" + repo_sanity_test "${REPO_BASE_DIR}"/"${BASE_DISTRO}" \ + "${REPO_BASE_DB_DIR}"/"${BASE_DISTRO}" + fi if [ '${BASE_DISTRO}' != '${HOST_BASE_DISTRO}' ]; then repo_create "${REPO_BASE_DIR}"/"${HOST_BASE_DISTRO}" \ @@ -67,14 +70,18 @@ repo() { "${BASE_DISTRO_CODENAME}" \ "${WORKDIR}/distributions.in" \ "${KEYFILES}" - populate_base_apt "${HOST_BASE_DISTRO}" - repo_sanity_test "${REPO_BASE_DIR}"/"${HOST_BASE_DISTRO}" \ - "${REPO_BASE_DB_DIR}"/"${HOST_BASE_DISTRO}" + if [ "${ISAR_USE_CACHED_BASE_REPO}" = "1" ] && \ + [ "${ISAR_PREFETCH_BASE_APT}" != "1" ]; then + populate_base_apt "${HOST_BASE_DISTRO}" + repo_sanity_test "${REPO_BASE_DIR}"/"${HOST_BASE_DISTRO}" \ + "${REPO_BASE_DB_DIR}"/"${HOST_BASE_DISTRO}" + fi fi } python do_cache() { - if not bb.utils.to_boolean(d.getVar('ISAR_USE_CACHED_BASE_REPO')): + if not bb.utils.to_boolean(d.getVar('ISAR_PREFETCH_BASE_APT')) and \ + not bb.utils.to_boolean(d.getVar('ISAR_USE_CACHED_BASE_REPO')): return 0 for key in d.getVar('BASE_REPO_KEY').split(): From patchwork Fri May 26 07:00:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Uladzimir Bely X-Patchwork-Id: 2843 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:45 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-oo1-f59.google.com (mail-oo1-f59.google.com [209.85.161.59]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 34Q70gpo013374 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 26 May 2023 09:00:42 +0200 Received: by mail-oo1-f59.google.com with SMTP id 006d021491bc7-54f6b5c7d1bsf311360eaf.2; Fri, 26 May 2023 00:00:42 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1685084436; cv=pass; d=google.com; s=arc-20160816; b=EkD427Z+eRca+qg6HQzgiMhLNmBmDPioWhPBEjOWg3sgLlazvVqoEOjU2QCv5Scb6t AsE1wMLO09f3x54NvFxSPqql7AWvVtX3r6KnBBfcc7RScIvAIWATDai/FonsJ30XdaPC Py++NlG74RZLp2BsqX6JfosE4/yuGo21RmwvjXk/U26P4XKyxsRv9Vfl3GFmM9OB5CHl 9gfXOnogqbXW1o8OYFy28nPPt+Biu8jyAcv45LCn8xpH8B8RuIyqpgoHvEN8kop5nYrP q2ciToQ6fKSSNKULiBco2knPheJ/4aARNnG0EcxC/LPifhF+DHFRBEkqLbkchbNatprU g6WQ== 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=T8SurfF0iaXdGfjW2sVG4WMlP1SmIWBTqOGmzUgaaN4=; b=gu1FCUVXKzkZtUSK8bXpFYq77h6w2mGmM+TLg7bJ3cyhui+J3XyCAveXJ1wGkWkLFB RbT1T7ZcJ7tcMZoLyqQnu9ysDUdSakJgezGMrVQWed9bhFoFSEmhQYYRwTrAZOvV68YY vW0hLPgu7+arjXcY5Jj9ehB2d34K5CVxWXLovsvg5eOZ9YxRiLyeGJ18w7kzIA8hkeuE ClmQTDJKQF57NpbIn5IRg5JMRC1ghY6ItMTq6YYzxKKGl3MFwgbqay261b5+9R3JWBOM SqOWtunCbjqRAQhZGnEJwIiUdRkOdW2AeUnDYCeOfLZfc2ZubD0hxVm7PhpS/LhHfkRq gC8Q== 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=1685084436; x=1687676436; 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=T8SurfF0iaXdGfjW2sVG4WMlP1SmIWBTqOGmzUgaaN4=; b=TC7be3bhh1AxCbK122Ze4pqrTbKWKCQmPtWPL5zLLZMvFObPJwPFc1f5me3ZMTgwLa ttqURgfKzrJY6iXedy1rkVrILDxe6319Hx4OWWQNsKl/wmeUENf3XtxRFOpy7geiIfaL cCfl3x1woOSdC2iZzVHLGMJgt2fYLChRcNcqZkIA5TueO4qklsEzqKU/icBOtVKW6lAx PVT0L78phlB6/ClWefiMzacedUPkXL4FoPStRNBwS5J5LVe3Qv9S7uNwek09TIMG8ZZr LAakrUiYSLchYnN1p6rOpuSqnC982LiOYgGTvQwwVmvvSi82oXf6BdbeYV5B+qPU8NgG Q2Rg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685084436; x=1687676436; 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=T8SurfF0iaXdGfjW2sVG4WMlP1SmIWBTqOGmzUgaaN4=; b=R1yeQURrcJaVC8qlFoDpbJwkOGDVgMrt2fB8tPzvN9RX8vRAJElb3ImzAAvJQuaJ9n gMEXdGGiB3uxxVAY+E66Kf2YdCRfk3jJccCXp//fX8z5BSc/j9bdtkbJoqCaszCyNXkt wR7jM+KSZ4HPGX1noo9whaR6+DSR0RTXVhm5nES7J1qKBY6x2Nb5QTdmuC7paeja3hgF FGsLqlonzAlyCJ1+C14KG6sFvEeeMb1jvvZqoOS4eeyCOR8oJ8UjtbiXqoqQGqA00sPT MwpggR317X63z+QBOtaDLtnzcwvqFH0Tdc/VzQZne5d6WvkqAMZ/jC08TDEXie+/HtLc 5gHg== Sender: isar-users@googlegroups.com X-Gm-Message-State: AC+VfDxdfohgZyuUqDbsjgySpC+GIsgG5cp7c5GdlaUuFGarF+kiv+/S 2LBrBvKcSqWLsSueW+Lz1Jc= X-Google-Smtp-Source: ACHHUZ6+ezgQ2jAmReYwVTbsy2aYBZeUkayshYyFStl0yBZyRGJSx5UwhljS/B4zALeZ9Iwm95YeiQ== X-Received: by 2002:a4a:5243:0:b0:54f:8345:1832 with SMTP id d64-20020a4a5243000000b0054f83451832mr375129oob.1.1685084436555; Fri, 26 May 2023 00:00:36 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6870:7711:b0:195:d294:2d3d with SMTP id dw17-20020a056870771100b00195d2942d3dls205547oab.0.-pod-prod-09-us; Fri, 26 May 2023 00:00:36 -0700 (PDT) X-Received: by 2002:a05:6870:b211:b0:199:ccad:7dcc with SMTP id a17-20020a056870b21100b00199ccad7dccmr275588oam.48.1685084436037; Fri, 26 May 2023 00:00:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685084436; cv=none; d=google.com; s=arc-20160816; b=HO09c+c0Tb3L9W+lubj1M1hfvcr0R/aQKrm0QDgTl6PN+NQiwNS3yqbSCFXDkAjorV s+/bEi4RGqYcmFyAy0ZcNEneeCxM24yvZr/HQ/t1aeqhvm3VvrmhYllB9I7l/zrHTdvR CKEWgy7ivTL0Wc8VrM8Am1tfbMPRrzO7cICt8qbJg32WRGzYeT+ekBJE8GYY1ChQxjmO FQYapX+zNA7CvRMp0+2NpFkfd1SMwzrBZhxfmUQ7yllPVZdpHSOQWCw/dfmfe7U1Q0eW cUCeTVTjcaVM29TO5Wtxq70ngzv85hGjZwLE4THzApgduG6Bf1zs9lsK3YjP1o8nntqX eoEw== 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=wk/RA20AwaT5IYEiG7iqhNXKF2d4XIehMTXhYvEThPc=; b=xpspfZMt/i5JKmHuQyD6kjVHguZoAxd50XggauN0UaeWqKywiNckW424IwcsKNKB6X 1e6sHDZDt8M+7KE4SRgvKs66DO7r+5QJfBVp5lL9ryPDk9gb40ieElBuW2yrEWW4ENIL 1fNKaq57sHBajfaD3QoxtkB5xO5d9XqjHJAXkeUzF+7Jqlqeo+XT3nzb79PEeUj2BMdN olpiOCdTpYucAnAvpuEnR8HEwsxTI+3RC81X78EnICBEP6dLbWEVkSnKkQMNI0sLl+78 h0PvJC+2GZnL6cf/smfuozg8p64XwIk7KNVg6USgCg5OrYCurT0MqQ/VY9srLkXsKD3M CITw== 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 d15-20020a4ad34f000000b005552377a831si256498oos.1.2023.05.26.00.00.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 26 May 2023 00:00:36 -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 34Q70R3a013306 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 26 May 2023 09:00:30 +0200 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v5 06/12] meta: Use cached base-apt repo to debootstrap Date: Fri, 26 May 2023 09:00:21 +0200 Message-Id: <20230526070027.16890-7-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?= This patch makes local base-apt repo to be created before debootstrap task. So, debootstrap is then done from it. The required packages are downloaded via python-apt and reprepro creates debian-like repository from .deb files. For debian targets host keyring is used while ubuntu/raspbian targets use keys specified by DISTRO_BOOTSTRAP_KEYS variable. The goal is have workable base-apt repo before first build completed. Signed-off-by: Uladzimir Bely --- .../isar-bootstrap/isar-bootstrap.inc | 99 +++++++++++++++++-- 1 file changed, 91 insertions(+), 8 deletions(-) diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc index 0cfe82ab..e1ddac42 100644 --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc @@ -29,6 +29,8 @@ DISTRO_BOOTSTRAP_BASE_PACKAGES:append:https-support = ",ca-certificates" DISTRO_VARS_PREFIX ?= "${@'HOST_' if d.getVar('BOOTSTRAP_FOR_HOST') == '1' else ''}" BOOTSTRAP_DISTRO = "${@d.getVar('HOST_DISTRO' if d.getVar('BOOTSTRAP_FOR_HOST') == '1' else 'DISTRO')}" BOOTSTRAP_BASE_DISTRO = "${@d.getVar('HOST_BASE_DISTRO' if d.getVar('BOOTSTRAP_FOR_HOST') == '1' else 'BASE_DISTRO')}" +BOOTSTRAP_DISTRO_ARCH = "${@d.getVar('HOST_ARCH' if d.getVar('BOOTSTRAP_FOR_HOST') == '1' else 'DISTRO_ARCH')}" + FILESEXTRAPATHS:append = ":${BBPATH}" inherit deb-dl-dir @@ -278,12 +280,73 @@ do_bootstrap[network] = "${TASK_USE_NETWORK_AND_SUDO}" inherit compat +inherit debrepo + +debrepo_bootstrap_prepare() { + if [ "${ISAR_PREFETCH_BASE_APT}" != "1" ]; then + return + fi + + if [ "${ISAR_USE_CACHED_BASE_REPO}" = "1" ]; then + return + fi + + debrepo_args="" + if [ "${BASE_DISTRO}" != "debian" ]; then + if [ "${BASE_DISTRO}" != "raspbian" ] && [ "${BASE_DISTRO}" != "raspios" ] || [ "${BOOTSTRAP_FOR_HOST}" = "0" ]; then + debrepo_args="$debrepo_args --keydir=${WORKDIR}" + fi + else + if [ "${BASE_DISTRO_CODENAME}" = "sid" ]; then + debrepo_args="$debrepo_args --keydir=${WORKDIR}" + fi + fi + #if [ "${ISAR_USE_CACHED_BASE_REPO}" = "1" ]; then + debrepo_args="$debrepo_args --no-check-gpg" + #fi + if [ "${ISAR_ENABLE_COMPAT_ARCH}" = "1" ]; then + debrepo_args="$debrepo_args --compatarch=${COMPAT_DISTRO_ARCH}" + fi + + debrepo_workdir=${DEBREPO_TARGET_DIR} + if [ "${BOOTSTRAP_FOR_HOST}" = "1" ]; then + debrepo_args="$debrepo_args --crossarch=${DISTRO_ARCH}" + if [ ${HOST_ARCH} != ${DISTRO_ARCH} ]; then + debrepo_workdir=${DEBREPO_HOST_DIR} + fi + else + debrepo_args="$debrepo_args --isaraptdir=${REPO_ISAR_DIR}/${DISTRO}" + fi + mkdir -p "${DEBREPO_WORKDIR}" + + if [ -n "${GNUPGHOME}" ]; then + export GNUPGHOME="${GNUPGHOME}" + fi + + flock -x "${DEBREPO_WORKDIR}/repo.lock" -c " + ${SCRIPTSDIR}/debrepo --init \ + --workdir=\"${debrepo_workdir}\" \ + --aptsrcsfile=\"${APTSRCS_INIT}\" \ + --repodir=\"${REPO_BASE_DIR}\" \ + --repodbdir=\"${REPO_BASE_DB_DIR}\" \ + --mirror=\"${@get_distro_source(d)}\" \ + --arch=\"${BOOTSTRAP_DISTRO_ARCH}\" \ + --distro=\"${BOOTSTRAP_BASE_DISTRO}\" \ + --codename=\"${BASE_DISTRO_CODENAME}\" \ + ${debrepo_args} \ + gnupg locales usr-is-merged + " +} + do_bootstrap() { if [ "${ISAR_ENABLE_COMPAT_ARCH}" = "1" ]; then if [ -z "${COMPAT_DISTRO_ARCH}" ]; then bbfatal "${DISTRO_ARCH} does not have a compat arch" fi fi + + debrepo_bootstrap_prepare + debootstrap_args="--verbose --variant=minbase --include=${DISTRO_BOOTSTRAP_BASE_PACKAGES}" if [ -f "${DISTRO_BOOTSTRAP_KEYRING}" ]; then debootstrap_args="$debootstrap_args --keyring=${DISTRO_BOOTSTRAP_KEYRING}" @@ -301,8 +364,19 @@ do_bootstrap() { sudo -E -s <<'EOSUDO' set -e if [ "${BOOTSTRAP_FOR_HOST}" = "0" ]; then - arch_param="--arch=${DISTRO_ARCH}" + arch_param="--arch=${BOOTSTRAP_DISTRO_ARCH}" fi + if [ "${ISAR_PREFETCH_BASE_APT}" = "1" ]; then + flock -x "${REPO_BASE_DIR}/repo.lock" -c " + ${DEBOOTSTRAP} $debootstrap_args \ + $arch_param \ + ${@get_distro_components_argument(d)} \ + ${@get_distro_suite(d)} \ + ${ROOTFSDIR} \ + file://${REPO_BASE_DIR}/${BOOTSTRAP_BASE_DISTRO} \ + ${DISTRO_DEBOOTSTRAP_SCRIPT} + " + else ${DEBOOTSTRAP} $debootstrap_args \ $arch_param \ ${@get_distro_components_argument(d)} \ @@ -310,7 +384,7 @@ do_bootstrap() { "${ROOTFSDIR}" \ "${@get_distro_source(d)}" \ ${DISTRO_DEBOOTSTRAP_SCRIPT} - + fi # Install apt config mkdir -p "${ROOTFSDIR}/etc/apt/preferences.d" install -v -m644 "${APTPREFS}" \ @@ -382,12 +456,21 @@ do_bootstrap() { if [ "${ISAR_ENABLE_COMPAT_ARCH}" = "1" ]; then chroot "${ROOTFSDIR}" /usr/bin/dpkg --add-architecture ${COMPAT_DISTRO_ARCH} fi - - chroot "${ROOTFSDIR}" /usr/bin/apt-get update -y \ - -o APT::Update::Error-Mode=any - chroot "${ROOTFSDIR}" /usr/bin/apt-get install -y -f - chroot "${ROOTFSDIR}" /usr/bin/apt-get dist-upgrade -y \ - -o Debug::pkgProblemResolver=yes + if [ "${ISAR_PREFETCH_BASE_APT}" = "1" ]; then + flock -x "${REPO_BASE_DIR}/repo.lock" -c " + chroot ${ROOTFSDIR} /usr/bin/apt-get update -y \ + -o APT::Update::Error-Mode=any + chroot ${ROOTFSDIR} /usr/bin/apt-get install -y -f + chroot ${ROOTFSDIR} /usr/bin/apt-get dist-upgrade -y \ + -o Debug::pkgProblemResolver=yes + " + else + chroot ${ROOTFSDIR} /usr/bin/apt-get update -y \ + -o APT::Update::Error-Mode=any + chroot ${ROOTFSDIR} /usr/bin/apt-get install -y -f + chroot ${ROOTFSDIR} /usr/bin/apt-get dist-upgrade -y \ + -o Debug::pkgProblemResolver=yes + fi umount -l "${ROOTFSDIR}/dev/shm" umount -l "${ROOTFSDIR}/dev/pts" From patchwork Fri May 26 07:00:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Uladzimir Bely X-Patchwork-Id: 2849 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:48 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-oi1-f189.google.com (mail-oi1-f189.google.com [209.85.167.189]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 34Q70gF2013380 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 26 May 2023 09:00:48 +0200 Received: by mail-oi1-f189.google.com with SMTP id 5614622812f47-3941c5de005sf400044b6e.2; Fri, 26 May 2023 00:00:43 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1685084437; cv=pass; d=google.com; s=arc-20160816; b=IXwOqhJEk4wl8RVs1nmMye16BjQjgIFA2jpzV2VKvimy3X/1N5ar6LuGPdy/BscXzT 6Vra7OcpUdEhEECMKHIG53SEwF/vq+EnLmZhKzTVngnrF5kTLdY2FobmbTN0KsbIhFOB A6RwEbyteCOBRcdCezAbYVlFBwVZCQvqarnFDJWBEeAx68GaX4Ks+gTjPNqfH+PSjjwp NRi8EeFdeM4MH+RdP5lwuMYcvzLiadOy/WGTlfE9ksX7EtKqeP4kdHUGVy7ptkZeo/CM GfleEHTqK0LqP1Jftgz/lS/CeNvs9n7aKqdCS5cP3CrItrpR3x/u5mRWg+AOga69tAgC KtFw== 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=NjhARR1ryE7xast3iZGXrUNxujbMjYoTyLZLQSIr0Ls=; b=nccE1PNgFK4cDn1qojhuac+mWzFlepm2eLXOIsnxqXbzsQvsj/4RGibLur6EMf8mfC ChJocPHex+Y4/egRV7mjF+OIFW2vsOy8ShnQdUAobf+csDqAUhxD0zSt9efbiDZUkZfv q5m8frPB+aq08Q5WFZMrg+BWJB2rUEAA3SYwM3To7ULLLyWkxqoIOGFrgzxB7ts/RoFF QbCZbyWihP1GSYnvrc8a/6cOBVxKYRUau94GgElYeI6nCABswb0buMX6g8N6hJr60Rou lvF4BnlXyj6lAvkANzWdUhIPot2nHdJpRk03Foje79hCPDqg0B/7i/xAHhrNqdrBMn5i HTvg== 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=1685084437; x=1687676437; 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=NjhARR1ryE7xast3iZGXrUNxujbMjYoTyLZLQSIr0Ls=; b=gCRNBvM+j7F+Xi+b/2jzFrXgCNdX6DTHM/QApsxKnytYnOzQ5JnN949/MjDRydPXm0 agSudRv061+so7MN24nga4Q/zPEkzDVVHQiRbG8OYpcbGiNFrp822/zDYcbnbldm+c64 eRZ2JdA+RDiUd4By3ye62VsNqsHm7yFAUnJH18MzhlMtFFraUenI3pVLTivcFLqdFa9A xjhz8F+PCo/IKV9ZVwMWe+oXdYeZUPZgxUU+uYwYoBudZLTMCGHIj+dV0eYlYfmPf0iS EzGPvKNJ0a/ANlNOq7b45GblIu9rnp488x6WbU6Q3itlazYufGoZsRGeV98snsIz3FKu vVmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685084437; x=1687676437; 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=NjhARR1ryE7xast3iZGXrUNxujbMjYoTyLZLQSIr0Ls=; b=PCluKzQEJuYaqtOqhS2T/q5XdxGrdWBxCrr7VxhxixWURv3riiTgC68WAXg1GqbCCR gE3M+CHEnjIOskn0yv/dHfP+sWNKgRyFT3XLNDlIRnIGUqwVdmLBUEHtiVEL/mQW3Gmn 3gPksogm0pSMVWn37Azu12w/taeaQTElwMS4jZbmmxGxCWkwIKh/yPVD2BXCSHC2gVrM 8ZvyVvP/fe3NWQzH1PNWU/n2U5xiUKAT96fPvy5utkTec83ufKLYK/DzZQM7PNJFhesP 3gSE5tsLiYvmLf9VxzkDTeJuPckQ0MvEmXggGvX3yrqkRSabMPsbMt1UPZ2PjLdTSz8X 6DpA== Sender: isar-users@googlegroups.com X-Gm-Message-State: AC+VfDwzEocSMLiAXuJYp6jnAVH/IYhJiDZcxJh9AYr7m2HR9rC44dhK JjFl8fTIowuU1beqp0gviyY= X-Google-Smtp-Source: ACHHUZ73pRALhIYOviTIS2TYnq58O4e9HX5r9ls5KGjCjmtqlVFjVr4xcO4e71CSybPNDZ4Y2Vnjxg== X-Received: by 2002:aca:3354:0:b0:38d:788b:38cd with SMTP id z81-20020aca3354000000b0038d788b38cdmr194634oiz.3.1685084436947; Fri, 26 May 2023 00:00:36 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6870:7711:b0:196:8f78:768d with SMTP id dw17-20020a056870771100b001968f78768dls1055917oab.0.-pod-prod-03-us; Fri, 26 May 2023 00:00:36 -0700 (PDT) X-Received: by 2002:a05:6871:3d5:b0:18f:dfb:bcb4 with SMTP id a21-20020a05687103d500b0018f0dfbbcb4mr431583oag.12.1685084436431; Fri, 26 May 2023 00:00:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685084436; cv=none; d=google.com; s=arc-20160816; b=AOtLobFIZmy3wWUIsVTd7/CBUWr7VYpH0g7aOXaiZLhPXFLWVESDIcyh5b1psCk1Zb RMqi/yA7mMuzQO5T7OTV/sTrzINupkZ2dQjygsBHtHaVqHVNrL3jpN4+2EW7idOKREUn 3uFIhcJSIxmTo4lfYSes8Z9TOw2MD2NUzf0k6T0LwGDhV1JBcxNOON7fegKogvQpiwL8 WoH4xnajoH/Fxg5hkDncWreeSOtdNCX8lvkzGUtnvPMvAm8J0o96pm5rtoTyGphdSVTj 9kXXP8hpGFHLpIz7Uk/p5HoRcniqFlD7ua/NYMKs3SawI9ycYbn+tG+1k6CIr4Fs8+r6 orTA== 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=ZSlLTd3Oeeo9kcw/ANv9ho2DaxV6xk5H7pxvkl6K/Qk=; b=gEVZoplVqIRMuil8FRnvLVvbOX9oDQH7BCIPLWXQd/xIt6iRdHL6a7AVFMAWSu3vrY TCIUB+edzg7Eyj9oAr5NDiFPgsMS10t3JT+P/OET7Z4NpMJKoqX754Bb0mA/PLkLaViy 2v1m2wSBQ5fkmvBFpQLliuNLfhPq0dJi10S2yB7X3gStlJb/nL8LTISK9w7dOXlB51Ra RZTRvOP8cp5rACT7m49I9ZQhsCHNd0f+ffKWJyQ8z5RrSwqmFF6p5FN1JN+uIfmeGijO HlO1l4Ne0t1UObhHTB5U1bPph2L7FzBMu+RzjWduA3jk1VASvchP5XoYXm4KM1Y6lzug s/WQ== 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 el1-20020a056870f68100b00192c6345ea7si478438oab.2.2023.05.26.00.00.35 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 26 May 2023 00:00:36 -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 34Q70R3b013306 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 26 May 2023 09:00:30 +0200 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v5 07/12] meta: Consider global debrepo context Date: Fri, 26 May 2023 09:00:22 +0200 Message-Id: <20230526070027.16890-8-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.9 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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?= For host/target and cross/native modes different debrepo context (e.g., working dir) should be used. Signed-off-by: Uladzimir Bely --- meta/classes/dpkg-base.bbclass | 11 +++++++++++ meta/recipes-devtools/buildchroot/buildchroot.inc | 11 +++++++++++ meta/recipes-devtools/sbuild-chroot/sbuild-chroot.inc | 11 +++++++++++ 3 files changed, 33 insertions(+) diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass index e3412c82..c3e47a69 100644 --- a/meta/classes/dpkg-base.bbclass +++ b/meta/classes/dpkg-base.bbclass @@ -12,6 +12,17 @@ inherit repository inherit deb-dl-dir inherit essential +python __anonymous() { + distro_arch = d.getVar('DISTRO_ARCH') + host_arch = d.getVar('HOST_ARCH') + cross = d.getVar('ISAR_CROSS_COMPILE', True) + + if cross == "0" or host_arch == distro_arch: + d.setVar('DEBREPO_WORKDIR', d.getVar('DEBREPO_TARGET_DIR', True)) + else: + d.setVar('DEBREPO_WORKDIR', d.getVar('DEBREPO_HOST_DIR', True)) +} + DEPENDS ?= "" RPROVIDES ?= "${PROVIDES}" diff --git a/meta/recipes-devtools/buildchroot/buildchroot.inc b/meta/recipes-devtools/buildchroot/buildchroot.inc index f74896fb..320df55a 100644 --- a/meta/recipes-devtools/buildchroot/buildchroot.inc +++ b/meta/recipes-devtools/buildchroot/buildchroot.inc @@ -13,6 +13,17 @@ SRC_URI = "file://configscript.sh \ file://deps.sh" PV = "1.0" +python __anonymous() { + distro_arch = d.getVar('DISTRO_ARCH') + host_arch = d.getVar('HOST_ARCH') + variant = d.getVar('BUILDCHROOT_VARIANT', True) + + if variant == "target" or host_arch == distro_arch: + d.setVar('DEBREPO_WORKDIR', d.getVar('DEBREPO_TARGET_DIR', True)) + else: + d.setVar('DEBREPO_WORKDIR', d.getVar('DEBREPO_HOST_DIR', True)) +} + inherit rootfs BUILDCHROOT_DIR = "${WORKDIR}/rootfs" diff --git a/meta/recipes-devtools/sbuild-chroot/sbuild-chroot.inc b/meta/recipes-devtools/sbuild-chroot/sbuild-chroot.inc index fd8bb648..03f812c9 100644 --- a/meta/recipes-devtools/sbuild-chroot/sbuild-chroot.inc +++ b/meta/recipes-devtools/sbuild-chroot/sbuild-chroot.inc @@ -8,6 +8,17 @@ LIC_FILES_CHKSUM = "file://${LAYERDIR_core}/licenses/COPYING.GPLv2;md5=751419260 PV = "1.0" +python __anonymous() { + distro_arch = d.getVar('DISTRO_ARCH') + host_arch = d.getVar('HOST_ARCH') + variant = d.getVar('SBUILD_VARIANT', True) + + if variant == "target" or host_arch == distro_arch: + d.setVar('DEBREPO_WORKDIR', d.getVar('DEBREPO_TARGET_DIR', True)) + else: + d.setVar('DEBREPO_WORKDIR', d.getVar('DEBREPO_HOST_DIR', True)) +} + inherit rootfs inherit compat From patchwork Fri May 26 07:00:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Uladzimir Bely X-Patchwork-Id: 2846 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:45 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-pf1-f184.google.com (mail-pf1-f184.google.com [209.85.210.184]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 34Q70h1C013388 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 26 May 2023 09:00:44 +0200 Received: by mail-pf1-f184.google.com with SMTP id d2e1a72fcca58-64d1c53cad8sf721282b3a.3; Fri, 26 May 2023 00:00:44 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1685084437; cv=pass; d=google.com; s=arc-20160816; b=HJfTGvYclwtkqogTIUB8P3T2kLmuVEjGsojRUudecYRwzGKQDZ/JOhBmearIHePtHG a4VAuImkgdS+64RsWLnVeu1SYbO9HeAbS2hRf2IZonMpDxNJeluM5ivf/Ad71oe0QPUV KUYFoQHbeKKuwAs171DJ2X05it8iRhtUD8OU7S6aS71sNSv7VtLAoAmg7Gzz/83ypXu8 NhKKeBPHMMW9W2E4ZbFXcj53+ZzfqNwZ1iXbUYrR0ZuzFeTiQNckKVt6cZLcczYMDR9Y COFTCdFVJ82Lx1GoJhhNC9OwJ87RYo+VMFMN/a0LNr8uOCh3H3C3RTn6gN9AO8cDa6tA ubKg== 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=Nk6KuRptsxGojLLiJJjnVRmoHvx+/Iv3x48VUesX0OQ=; b=FRktt7seyq9tFD2ybKNJPbEm1N4WmIAJjz5Sp+2DeEzcHca8DYejgPkLP+aFzipGXt TcEIIG8kfe4yhTm158rnv2wfPJ3AGfc6jMFZSMAYjpFm3NcgKaWBN/bvzrnXTuRQ9F5O CbDMuu0O+aBy1tuat3mnUm2ekhvkkS2ipG10yx1gmBA2LkQwkqqCbK6kjOVwj3HL6sfK G8DPeXgFtmQ2AAi1c6fHppWmozdYPpbw71aH4QNGpJ3wJBmCtMry1hgVo1ahqSbMrmNQ OV4jnp/lobyf5nB+Zs2DAHzCpLfG1/7S6Rw3OrSEojHN4mMCbz6MeSOyZSF5M04AYaf2 H8cA== 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=1685084437; x=1687676437; 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=Nk6KuRptsxGojLLiJJjnVRmoHvx+/Iv3x48VUesX0OQ=; b=kB/10HnSNR2Y30VZ6BGYq592dJzWs6U6gyh8vkBAk1zlo/AiWwHcNMfhDM+xv5at5Y c2QO0pEGOoPpwc3igEMsQkN/m5W5RCginkZAPrinLShujp9Kc4H2uQ/UbLHxXK5bXVtq sbHb3fcs44j/K4PIx+QO6u2xdxfJbDzBoRfnVwoX4liN3+jdKzd/O7lHxfv+IznEVSpP Q3ERXG2/t1a/gFfuwZUaXXdQcCId80eL2PQldlwJEJUcaP8pC78rpuhIn2Cxp0pdyzUc Bjp0zAzY4trQU9LI27mUCcklD8VCThcq07XFDtxlY6lbyxxk6DEKeGKa8QTbuf5dhbdl JznA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685084437; x=1687676437; 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=Nk6KuRptsxGojLLiJJjnVRmoHvx+/Iv3x48VUesX0OQ=; b=Z/I+Bs6dnvGpZqeQ59RQ0SMvs3q/J+osyXqsfRr55v9uEsz8P2G/k6nrFsdsQaEmL6 9Z0I3qPHktPw91BPC3fFSe3sFgFo0IejJtk/AIZ0LpG/q19GZ/NuVDJ3u/vzPAEU44Ue uzzu4oxR/spqxDfDe4xy5ZLyrzsr/6uWQC5g8DQ0ZSoDcYCcdIYipF9Dqfzyfo842UYh Y+8w9ohmRxmsZnUnCzNVygMG7KdFwBgTzfZR4KCcyTmcb/z4FzjcZwPe7/bLZl4RY1vi 7A8Rbj5JXLBZ6T/xTUaAbphoVSb2SzY5pR7wRbaqbH+gL0qtvfaoGgFZ8twEMawDNtSg wCwg== Sender: isar-users@googlegroups.com X-Gm-Message-State: AC+VfDzJ8AQVGNSBk6p1297gBrbTFJ2mv4xl61Y594fygtmgfqDFkhN5 SEoZPyrWau8NzdXVaj2P2l0= X-Google-Smtp-Source: ACHHUZ7nmiBtuO2FLizYVLVYqV6gb/gdmghVjnyJzz36XXjltj6nxH3v0sF85f91DeeJu0YCMsSGfQ== X-Received: by 2002:a05:6a00:15d4:b0:643:a029:5b3f with SMTP id o20-20020a056a0015d400b00643a0295b3fmr530488pfu.2.1685084437338; Fri, 26 May 2023 00:00:37 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a62:cdc1:0:b0:64d:6575:dc3f with SMTP id o184-20020a62cdc1000000b0064d6575dc3fls1928607pfg.0.-pod-prod-08-us; Fri, 26 May 2023 00:00:36 -0700 (PDT) X-Received: by 2002:a05:6a00:1809:b0:643:aa2:4dcd with SMTP id y9-20020a056a00180900b006430aa24dcdmr1943830pfa.16.1685084436478; Fri, 26 May 2023 00:00:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685084436; cv=none; d=google.com; s=arc-20160816; b=Rxpdz2hZklj6/iM9D5GDifor6RJVfYuA7CYZReU7fWuZWHm/zwOWHmEvuwZ4kd/nis fFqGseeN/MlKjHe5pcfFSxyz+P83lkS8sXp9Y1XpW7L34hjnNtJTCVIFlc+q9z63ktR2 EUfKR8NBmG4YQgiCp42QkS8C5ReOe//k1MPCtPLjb0z2RT8EPmMOnwrHEkWdIrmspG+t 8ur0LyZbsJ5tPxxaO4f3Rm49Lk9ZQ81BgpsuMOsvDb5PtOAp6y3sfTzutNGQTkglm6gj lr7r8m9c5FW6eE5LfgRN9PLl7PmFcFKLhrIc37jq4UAsz6Q1R6hyNw7nj5TzudK8cVNx w18g== 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=IlQXBCUH1GZmpqnuzrWVS/60kim65u/urNsIsS0ZRRI=; b=OyHlO/nPynSE03ptDPBn6CrDxzuMmLQtMeKQyD/+w6Q3wE2Vn15WGWTEqf+YtC67jX M24d8Nznnpt1jH/9vC5ae7EsekJRK8sq/0zbk7QmethbCVsMeYy5CHCbUvGyUXVhdOk3 oj7uOU2tGv9w4Iy/H63YSlKnm/rzdu1SkDcNYW4HSOWdx6N8ecUxSdTJ3T17fQ9ecGUK zjjYHn+5G6hRie6STxBq1nQi8NjBmCMzcoeAOISZmi2mVWjcs1L6y1Y/ShnfZ2Ea15/3 g7RfINeRVOlXEtBtCb7IppmuhZvAOp+A4Z5i4PfX0NzUy52FEtX2aICyuHL2ooM+lEur e/kg== 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 o9-20020a056a001bc900b006438069d21bsi293196pfw.1.2023.05.26.00.00.35 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 26 May 2023 00:00:36 -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 34Q70R3c013306 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 26 May 2023 09:00:30 +0200 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v5 08/12] base-apt: Predownload packages to base-apt before install Date: Fri, 26 May 2023 09:00:23 +0200 Message-Id: <20230526070027.16890-9-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?= This patch uses debrepo script to predownload packages to base-apt repository before they are installed in buildchroot/rootfs. Signed-off-by: Uladzimir Bely --- meta/classes/dpkg-base.bbclass | 36 ++++++++++++++++++-- meta/classes/dpkg.bbclass | 8 +++++ meta/classes/image-locales-extension.bbclass | 5 +++ meta/classes/image-tools-extension.bbclass | 9 +++++ meta/classes/rootfs.bbclass | 4 +++ 5 files changed, 60 insertions(+), 2 deletions(-) diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass index c3e47a69..faf2ec77 100644 --- a/meta/classes/dpkg-base.bbclass +++ b/meta/classes/dpkg-base.bbclass @@ -23,6 +23,8 @@ python __anonymous() { d.setVar('DEBREPO_WORKDIR', d.getVar('DEBREPO_HOST_DIR', True)) } +inherit debrepo + DEPENDS ?= "" RPROVIDES ?= "${PROVIDES}" @@ -126,10 +128,25 @@ do_apt_fetch() { trap 'exit 1' INT HUP QUIT TERM ALRM USR1 trap 'schroot_cleanup' EXIT + # Begin chroot session + session_id=$(schroot -b -c ${SBUILD_CHROOT}) + + debrepo_add_packages --srcmode "${DEBREPO_TARGET_DIR}" "${SRC_APT}" + if [ "${ISAR_PREFETCH_BASE_APT}" = "1" ]; then + flock -x "${REPO_BASE_DIR}/repo.lock" -c " + schroot -d / -r -c ${session_id} -u root -- \ + sh -c 'apt-get -y update -o Dir::Etc::SourceList=\"sources.list.d/base-apt.list\" -o Dir::Etc::SourceParts=\"-\" ' + " + fi + for uri in "${SRC_APT}"; do - schroot -d / -c ${SBUILD_CHROOT} -- \ + schroot -d / -r -c ${session_id} -- \ sh -c 'mkdir -p /downloads/deb-src/"$1"/"$2" && cd /downloads/deb-src/"$1"/"$2" && apt-get -y --download-only --only-source source "$2"' my_script "${BASE_DISTRO}-${BASE_DISTRO_CODENAME}" "${uri}" done + + # End chroot session + schroot -e -c ${session_id} + schroot_delete_configs } @@ -139,6 +156,8 @@ do_apt_fetch[network] = "${TASK_USE_NETWORK_AND_SUDO}" # Add dependency from the correct schroot: host or target do_apt_fetch[depends] += "${SCHROOT_DEP}" +# Debrepo context is created by target bootstrap, need this dependency too +do_apt_fetch[depends] += "isar-bootstrap-target:do_bootstrap" do_apt_unpack() { rm -rf ${S} @@ -150,8 +169,18 @@ do_apt_unpack() { trap 'exit 1' INT HUP QUIT TERM ALRM USR1 trap 'schroot_cleanup' EXIT + # Begin chroot session + session_id=$(schroot -b -c ${SBUILD_CHROOT}) + + if [ "${ISAR_PREFETCH_BASE_APT}" = "1" ]; then + flock -x "${REPO_BASE_DIR}/repo.lock" -c " + schroot -d / -r -c ${session_id} -u root -- \ + sh -c 'apt-get -y update -o Dir::Etc::SourceList=\"sources.list.d/base-apt.list\" -o Dir::Etc::SourceParts=\"-\" ' + " + fi + for uri in "${SRC_APT}"; do - schroot -d / -c ${SBUILD_CHROOT} -- \ + schroot -d / -r -c ${session_id} -- \ sh -c ' \ set -e dscfile="$(apt-get -y -qq --print-uris --only-source source "${2}" | cut -d " " -f2 | grep -E "*.dsc")" @@ -160,6 +189,9 @@ do_apt_unpack() { dpkg-source -x "${dscfile}" "${PPS}"' \ my_script "${BASE_DISTRO}-${BASE_DISTRO_CODENAME}" "${uri}" done + + # End chroot session + schroot -e -c ${session_id} schroot_delete_configs } do_apt_unpack[network] = "${TASK_USE_SUDO}" diff --git a/meta/classes/dpkg.bbclass b/meta/classes/dpkg.bbclass index 5c8996d6..ea26b530 100644 --- a/meta/classes/dpkg.bbclass +++ b/meta/classes/dpkg.bbclass @@ -32,6 +32,7 @@ dpkg_runbuild() { export PARALLEL_MAKE="${PARALLEL_MAKE}" rm -f ${SBUILD_CONFIG} + debrepo_handle_controlfile "${WORKDIR}/${PPS}/debian/control" env | while read -r line; do # Filter the same lines @@ -101,6 +102,11 @@ dpkg_runbuild() { sh -c "cd ${WORKDIR}; dpkg-source -q -b ${PPS}" DSC_FILE=$(find ${WORKDIR} -name "${DEB_SOURCE_NAME}*.dsc" -print) + locked_update_cmd=":" + if [ "${ISAR_PREFETCH_BASE_APT}" = "1" ]; then + locked_update_cmd="flock -x /base-apt/repo.lock -c 'apt-get -y update'" + fi + sbuild -A -n -c ${SBUILD_CHROOT} --extra-repository="${ISAR_APT_REPO}" \ --host=${PACKAGE_ARCH} --build=${BUILD_HOST_ARCH} ${profiles} \ --no-run-lintian --no-run-piuparts --no-run-autopkgtest --resolve-alternatives \ @@ -109,8 +115,10 @@ dpkg_runbuild() { --chroot-setup-commands="echo \"APT::Get::allow-downgrades 1;\" > /etc/apt/apt.conf.d/50isar-apt" \ --chroot-setup-commands="rm -f /var/log/dpkg.log" \ --chroot-setup-commands="ln -sf ${ext_deb_dir}/*.deb -t ${deb_dir}/ || :" \ + --chroot-setup-commands="${locked_update_cmd}" \ --finished-build-commands="rm -f ${deb_dir}/sbuild-build-depends-main-dummy_*.deb" \ --finished-build-commands="cp -Ln --no-preserve=owner ${deb_dir}/*.deb -t ${ext_deb_dir}/ || :" \ + --finished-build-commands="mkdir -p ${ext_root}" \ --finished-build-commands="cp /var/log/dpkg.log ${ext_root}/dpkg_partial.log" \ --debbuildopts="--source-option=-I" \ --build-dir=${WORKDIR} --dist="isar" ${DSC_FILE} diff --git a/meta/classes/image-locales-extension.bbclass b/meta/classes/image-locales-extension.bbclass index b48bcec8..aa4874c1 100644 --- a/meta/classes/image-locales-extension.bbclass +++ b/meta/classes/image-locales-extension.bbclass @@ -6,6 +6,8 @@ # This class extends the image.bbclass for setting locales and purging unneeded # ones. +inherit debrepo + LOCALE_GEN ?= "en_US.UTF-8 UTF-8\n\ en_US ISO-8859-1\n" LOCALE_DEFAULT ?= "en_US.UTF-8" @@ -29,6 +31,9 @@ ROOTFS_INSTALL_COMMAND_BEFORE_EXPORT += "image_install_localepurge_download" image_install_localepurge_download[weight] = "40" image_install_localepurge_download[network] = "${TASK_USE_NETWORK_AND_SUDO}" image_install_localepurge_download() { + debrepo_add_packages "${DEBREPO_WORKDIR}" "localepurge" + debrepo_update_apt_source_list "${ROOTFSDIR}" "base-apt" + sudo -E chroot '${ROOTFSDIR}' \ /usr/bin/apt-get ${ROOTFS_APT_ARGS} --download-only localepurge } diff --git a/meta/classes/image-tools-extension.bbclass b/meta/classes/image-tools-extension.bbclass index 7c84505f..f98cd759 100644 --- a/meta/classes/image-tools-extension.bbclass +++ b/meta/classes/image-tools-extension.bbclass @@ -6,6 +6,7 @@ # This file extends the image.bbclass to supply tools for futher imager functions inherit buildchroot +inherit debrepo IMAGER_INSTALL ??= "" IMAGER_BUILD_DEPS ??= "" @@ -21,14 +22,22 @@ do_install_imager_deps() { fi distro="${BASE_DISTRO}-${BASE_DISTRO_CODENAME}" + debrepo_workdir=${DEBREPO_TARGET_DIR} if [ ${ISAR_CROSS_COMPILE} -eq 1 ]; then distro="${HOST_BASE_DISTRO}-${BASE_DISTRO_CODENAME}" + if [ ${HOST_ARCH} != ${DISTRO_ARCH} ]; then + debrepo_workdir=${DEBREPO_HOST_DIR} + fi fi buildchroot_do_mounts E="${@ isar_export_proxies(d)}" deb_dl_dir_import ${BUILDCHROOT_DIR} ${distro} + + debrepo_add_packages "${debrepo_workdir}" "${IMAGER_INSTALL}" + debrepo_update_apt_source_list "${BUILDCHROOT_DIR}" "base-apt" + sudo -E chroot ${BUILDCHROOT_DIR} sh -c ' \ apt-get update \ -o Dir::Etc::SourceList="sources.list.d/isar-apt.list" \ diff --git a/meta/classes/rootfs.bbclass b/meta/classes/rootfs.bbclass index cedde239..47f07129 100644 --- a/meta/classes/rootfs.bbclass +++ b/meta/classes/rootfs.bbclass @@ -2,6 +2,7 @@ # Copyright (c) Siemens AG, 2020 inherit deb-dl-dir +inherit debrepo ROOTFS_ARCH ?= "${DISTRO_ARCH}" ROOTFS_DISTRO ?= "${DISTRO}" @@ -148,6 +149,9 @@ rootfs_install_pkgs_download[weight] = "600" rootfs_install_pkgs_download[isar-apt-lock] = "release-after" rootfs_install_pkgs_download[network] = "${TASK_USE_NETWORK_AND_SUDO}" rootfs_install_pkgs_download() { + debrepo_add_packages "${DEBREPO_WORKDIR}" "${ROOTFS_PACKAGES}" + debrepo_update_apt_source_list "${ROOTFSDIR}" "base-apt" + sudo -E chroot '${ROOTFSDIR}' \ /usr/bin/apt-get ${ROOTFS_APT_ARGS} --download-only ${ROOTFS_PACKAGES} } From patchwork Fri May 26 07:00:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Uladzimir Bely X-Patchwork-Id: 2845 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:45 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-pl1-f187.google.com (mail-pl1-f187.google.com [209.85.214.187]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 34Q70hv6013383 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 26 May 2023 09:00:44 +0200 Received: by mail-pl1-f187.google.com with SMTP id d9443c01a7336-1ae437c2b32sf3317005ad.2; Fri, 26 May 2023 00:00:44 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1685084437; cv=pass; d=google.com; s=arc-20160816; b=xl97rWopEZJJVMeTLe/jv6L9xljHAhGA9gBM5r1huxEKHuxJjNQWAkajkEWGFH9dPq eP/JVNYfdPLS6O4U3xRuBKSIKsfhTpsJGJgWFjotJG1ph4+0eRADI5vXG4MaXNgzjEim 7CPnAmEsRKph2SMBRCmkHZ+QihxAmEHvysPO0dr/i64+GSnDfehoFHBQ26866KMpOd39 dg+ow95q1LwDCn/dKNOGqQVXUsfMWM24gbQ6nLY9GL82tiRRLb09L9p4ER/DDijOjYW1 aVzggZOiBPFOGxhqJG6VjpecVduAMZ1RkMEY5mpuINp2s1y5LVITx3reBEpFEYjJT/lr msQA== 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=SIeqZudAH0mrcXTur8V9ULgG7mMSnRRXF9cCUQtPkQY=; b=LVgt1uq0bbGWzGp4ZPofuVDAlNKVXNALtOvss2fdpvPWdBVID+zjWGGr8VAoDiSroJ 1utzQG7peSi9xzQABn2PYRJq3fQhRb1m0YNWf7JGnA/u/YP78r5Be+we53nDRv3kROdH EDw1Gp2PTO9aE+4HBanVkA1QrgJYLwXnHsZDQyARa8wGTiRapLh5X2FMew6d/JBjEciS ayYEdGu0GBtohVTtXevaOrsfTSpTlLeGmGch2OlaGJVOVUgYrNpgv0iPd3E3o9VFuR3D JOBnuNFJ4UmD+7VxKNc3NYcc8oRAi0av4KuIXUzy5JycHKSiAm3xvtdXMyffi5QnbGsg IVeA== 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=1685084437; x=1687676437; 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=SIeqZudAH0mrcXTur8V9ULgG7mMSnRRXF9cCUQtPkQY=; b=qFbGdz98h8nFz44HICF+EKhsjB8B/JjxWE/paaEwCx/aXhpA1QuNX44S6MrUYUcK5a ITgmlFkpJi8EXGgqbzJbBXGQZtqDJqs/j2DEkVgw1vVpQUkllmDd7gNLrwoH5La+iqiE +xxAyPlnOrWaAwLqGaKB3JsZyHg7Nftf4GsFxO/+e8fCR3OhA4RcFcVAXM//1Pruy4Qu VodIllN/cywlHLgKCCEsYfVeeKZnd/Jt5ZMRrEbXLjWynVuGMmMFkLDEHvRa9ZUuWlSJ 2KLzsOZ+Or8yzSHXUL1bMm97mM8zGFHQb5+HlD8DBWsGdGi4jfGfdY8LL6LYPgJ7qiUg jevg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685084437; x=1687676437; 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=SIeqZudAH0mrcXTur8V9ULgG7mMSnRRXF9cCUQtPkQY=; b=YvuRbnfAW3XaBUC+i1CxWDJDP2RrMJmUwRQcbEdGbvfMoLPnIf9pSYRmtjy7EJfRGH IyTSlmFRD3IbkYEE6aMh5V7m+n3UZc6/jlHhtnlrSrQ8HvtjUZCHGxqhB8k/FmSm+iq6 VpYPOS2N0/a9QXmk2m/1qc51Q+P6Bs1UJoEp51FYKj6JlEwLeHQCox25S4fC9hQl8z9D zXzW4PAnE2MUut1/tdldNnafTpOeCHBklcwEkRtM9w5Eumfh5CnpobNpqYtefDxgzwdR OdIlp9aYvOvL5F5ikg2J6l2hYDS7crP8p5a0EBeWFg9tFELb8xc5ySEXSEylZkj5okXW Q1ZA== Sender: isar-users@googlegroups.com X-Gm-Message-State: AC+VfDxXsp280lmx60VomIXLI3i4CENaZ4HZJpJNDKM3w+GrT1t8OYrg kd/0Ve1dCENt8VUYonCcGEQ= X-Google-Smtp-Source: ACHHUZ5mH9Pg05BQOiC1OZTJgzbbBEvvw2U4Sj7niaIZZPZrrJfNFggRNY73JCNE/KvkRr3hENERGw== X-Received: by 2002:a17:903:32c8:b0:1af:aa36:14 with SMTP id i8-20020a17090332c800b001afaa360014mr1895287plr.11.1685084437351; Fri, 26 May 2023 00:00:37 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:903:32cc:b0:1ad:d7a0:1d80 with SMTP id i12-20020a17090332cc00b001add7a01d80ls1981195plr.0.-pod-prod-07-us; Fri, 26 May 2023 00:00:36 -0700 (PDT) X-Received: by 2002:a05:6a20:3d0e:b0:101:2160:ff8f with SMTP id y14-20020a056a203d0e00b001012160ff8fmr1185746pzi.11.1685084436450; Fri, 26 May 2023 00:00:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685084436; cv=none; d=google.com; s=arc-20160816; b=G4ZPymPu1appLegYUrWLp9p6TR3k9/PSFBXnicG3qXFlD4PLGKiY66xfkTnKGtd2t/ yRKpcfzJwvlDkqJc/PmphILI4nXP24JHC8E/Ctvm2Ypwc9euxUOODI9QjuZXzA9ks0J2 9U8Gexs/CNg7ovokSXX2pYXmOf2CiqwIJdlnaYCIsHOkD+iw0T3qNCux9Usf3Tqynd+X oXg2bGcOLkdptlLjFPTeZGhmqG9r566u7diifsvc75kGWi1VFAqRutwYzY1C6vVOzQYr b/YBDBmuw5ifiBfR9mZywKjwFyl8V0T0a2ppW3nOrGSWUB01KRSDMFC8202p34poKUBa 0uXg== 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=j6nq0sfrjvwH/slo9fAvomeI09KVXkUzgZec3JMu5h0=; b=PZiJchuQ8pepEWOOczxqI5+RbSB3vbOxBl4ff6t+pEoFrYYYO4luEtahWba76og7Y0 sijH0PubWucbKtJqg+9kS2JA1p7XCe86KOAv1Dr4s7iB6uu/pKs3zejFtL3S6UCvS61/ rFaRFQRm3JUQHWkRSkdKXfltUskFcVywxHBc5D9lyskdUMS5ysjpFwpWvBW0ISN7OW7i goveUi6ofyqakuIfPqvara93EKgBn2rNYFNdHKwlOLjREr6bHtkDGe62JYx/Yx8ys7kP ZfelOPHfnIgs3l4/J9iPzx+z4hs0Lx6vESuwRXKKFWef/cvGc+M6KrySQGVQ1s4jsIBO HR7g== 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 e10-20020a170903240a00b001ae20d30d75si54777plo.6.2023.05.26.00.00.35 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 26 May 2023 00:00:36 -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 34Q70R3d013306 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 26 May 2023 09:00:31 +0200 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v5 09/12] meta: Add cache-deb-src functionality in base-apt mode Date: Fri, 26 May 2023 09:00:24 +0200 Message-Id: <20230526070027.16890-10-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?= Fill base-apt repo with source packages. Signed-off-by: Uladzimir Bely --- meta/classes/deb-dl-dir.bbclass | 17 +++++++++++++++++ meta/classes/rootfs.bbclass | 4 ++++ 2 files changed, 21 insertions(+) diff --git a/meta/classes/deb-dl-dir.bbclass b/meta/classes/deb-dl-dir.bbclass index f0ab9714..a7a8dcf7 100644 --- a/meta/classes/deb-dl-dir.bbclass +++ b/meta/classes/deb-dl-dir.bbclass @@ -43,6 +43,23 @@ debsrc_undo_mounts() { EOSUDO } +debsrc_fill_base_apt() { + export rootfs="$1" + + local srcpkgs="" + for package in $(find "${REPO_BASE_DIR}" -maxdepth 6 -type f -iname '*\.deb'); do + is_not_part_of_current_build "${package}" && continue + local src="$( dpkg-deb --show --showformat '${source:Package}' "${package}" )" + local version="$( dpkg-deb --show --showformat '${source:Version}' "${package}" )" + local dscname="$(echo ${src}_${version} | sed -e 's/_[0-9]\+:/_/')" + local dscfile=$(find "${DEBSRCDIR}"/"${rootfs_distro}" -name "${dscname}.dsc") + [ -n "$dscfile" ] && continue + + srcpkgs="${srcpkgs} ${src}=${version}" + done + debrepo_add_packages --srcmode "${DEBREPO_TARGET_DIR}" "${srcpkgs}" +} + debsrc_download() { export rootfs="$1" export rootfs_distro="$2" diff --git a/meta/classes/rootfs.bbclass b/meta/classes/rootfs.bbclass index 47f07129..0ada4721 100644 --- a/meta/classes/rootfs.bbclass +++ b/meta/classes/rootfs.bbclass @@ -230,8 +230,12 @@ cache_deb_src() { sudo cp -Trpn --reflink=auto "${BOOTSTRAP_SRC}/var/lib/apt/lists/" "${ROOTFSDIR}/var/lib/apt/lists/" deb_dl_dir_import ${ROOTFSDIR} ${ROOTFS_BASE_DISTRO}-${BASE_DISTRO_CODENAME} + + debsrc_fill_base_apt ${ROOTFSDIR} + debrepo_update_apt_source_list "${ROOTFSDIR}" "base-apt" debsrc_download ${ROOTFSDIR} ${ROOTFS_BASE_DISTRO}-${BASE_DISTRO_CODENAME} + sudo rm -f "${ROOTFSDIR}"/etc/resolv.conf if [ -e "${ROOTFSDIR}"/etc/resolv.conf.isar ] || [ -h "${ROOTFSDIR}"/etc/resolv.conf.isar ]; then From patchwork Fri May 26 07:00:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Uladzimir Bely X-Patchwork-Id: 2844 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:45 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-ot1-f55.google.com (mail-ot1-f55.google.com [209.85.210.55]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 34Q70hd6013391 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 26 May 2023 09:00:44 +0200 Received: by mail-ot1-f55.google.com with SMTP id 46e09a7af769-6b0c537a99csf462913a34.0; Fri, 26 May 2023 00:00:44 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1685084438; cv=pass; d=google.com; s=arc-20160816; b=WdMaamgE7jz6vrTE6jV/zaOS+iiNFlsnDaJ+g/ninvYmN//LAeILTtRpKHQKWw875s Kv7mOMjiTDTXgP2w3Wmb106LXBGKXg4W9FE5zipyHoJ0wzjzxRQy68HfgGIBpg/Qf5hF QmSDwiBOoLGIRjYh+jbvIuY9GMYGlE+x0+8itd0sgdrx0aGz5/HrPhjOl4W1qfvOLu0Y lfoSV9KV0mCivRk4IuL1XIUuo8IvzY64Zi+WQ+RSbXptFKLShaf31w7E6yJu5H7ZPsb/ l19I4NxFCHVsOKztSSmBmm7JBbiE4LZUhEfImzNg44zRH8S5Mjb/rJ/jDE2Uu/6E9fjH YCcA== 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=YMV/lswDNs10GvRZmCC74jVzepyoSlrAge6xNLez/Xg=; b=UTTAbfu5K/M43tDp8UR2gcvtyGqjjb43/mSMZulAOgoOn5sXe7HhED421Ra8dk/Mel X4UU9DsVvlxNhJzi7tk9gFUCyMSUkCQtN7PBOsfjRoHcE3GQ944X3Kysm/yP9Gs0XtVu 1V/jqLs4COPXOr3OC6NScrbRe0xy+/5CkgzBvSnc4seDZkMP35FTBP9kk8bdTWW7NgUB RWYms6ins+wjWwPTgFdqf1XeOpPkCSrRHkZRDiBjFQKwg8yCiwl9KwbXwVVo+paiub08 WdCLjgTys5qCc+kDSDlKK0kcdxTe1A8nu8Lu+KwT9QobMpqEATts+miGWxOQMYDCUwV8 Gd1g== 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=1685084438; x=1687676438; 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=YMV/lswDNs10GvRZmCC74jVzepyoSlrAge6xNLez/Xg=; b=sR66Pb5CxUlKPEvWZQfjwqmxgj5Qlu4v3KM8k+peTlZ67r+GgIPjvKieJlz9xjoOVw Nm7bfBv+oo1F6ssF0L9+AlU12r29ihBMMyah/q8OzD1qrTQTYioYl4Jc8Tvr0NOUFmfh Tr4C4tbNCg9ToqALUH/wgba0OQV1hloxjH5LDT7wu3HAPF0vB7dglTo6SH9N9a3Spgn1 zqSQFyS+cXpPQioejIxG9ZCA0EmTRoQhp4r/bJaD+tCuLWGRNLCBbnnpnTKaCUxfkY/6 bgVwah+DYbQYzw6onCUie2JKWHhfKtfKyt4uaGFVL5hP4+qNqmdnvW9hQBOJe45Y/zEI Nicg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685084438; x=1687676438; 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=YMV/lswDNs10GvRZmCC74jVzepyoSlrAge6xNLez/Xg=; b=KWVtF9ILJTWHDN5741BJvGTMxPQ749wYhtGnRE/f5egtb3SCdryMNHQHjwqIkjmn4F 5iyCnJaG2RwTh45VyyMiPBBsq+YbFpPNGZYcWZeBKazkIF6W5K4Qn/hRCOerb7aB4YCw FNztbm21nrnUraGEAsQO2bedQwavj1mzWVJBW1KRDsxPEpXbCMYNVBmkN3Uc/rgqe/dA XhCpd6aEop2sr2Ku4tp2yTJs1yeM4n1ccryiXpP5Pp3NaqbS6q4qH96u57in5HnVLFOj SBESAjWWQuOSJ8eV2EYuaTbV86/MxIDaBNFW2aHRd51U/T+MXw2rKykMqlPkU5FUz4bO i03w== Sender: isar-users@googlegroups.com X-Gm-Message-State: AC+VfDw/0uy9TzjMV/38ilLnfkzk5YSfA4hTreWrPsM+Lwg8dsq7C5uG T9M/Ub4sfVHmlTGnaFb+zOY= X-Google-Smtp-Source: ACHHUZ5Hd61kYIebyLSfrDZQRn5hBl6fxr/Zgl4Icg09rM+v3l6Ifs/V5W1zjaxZCpeQ27AkJgixbw== X-Received: by 2002:a9d:66ce:0:b0:6af:9c8d:8b14 with SMTP id t14-20020a9d66ce000000b006af9c8d8b14mr157524otm.2.1685084437880; Fri, 26 May 2023 00:00:37 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a4a:d697:0:b0:555:458b:d30d with SMTP id i23-20020a4ad697000000b00555458bd30dls1100767oot.0.-pod-prod-05-us; Fri, 26 May 2023 00:00:37 -0700 (PDT) X-Received: by 2002:a05:6808:e88:b0:393:fb3e:6151 with SMTP id k8-20020a0568080e8800b00393fb3e6151mr586687oil.50.1685084437118; Fri, 26 May 2023 00:00:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685084437; cv=none; d=google.com; s=arc-20160816; b=ppIJGBwPWCLW2C1J5Lc2oJ0QepmvVQmvpv3Qm+VcwyCqpYi8aZZbKngL+RrEhxHZGD kEixr0w5+V8mIK/OEiuqssqQDUoY+5i6TsZhNmPbBcTkFXdM5BUED9SnEOoKnQPNmd05 ChshXPUom29KhLiHRG/JjPfGDBgmOOs9Ahr29Q7MzPgy//vuzvQMoExRUlrVvjOzbowA WghjPkSmHwUmhkTpws7b6nRNP3cmBIKokwS/g2o65t3CaNBOIfktAbqQaqlh1ncWU2/i 7x3GOR5ogBggfsrxzRw9eT9i2ZAKVCujcwQizBboh93gCDe0ZEF9wO+akrJSUWuHQ9AB yEDA== 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=aUC1aRv+EOfdJj6Qihm4gGX1t/Xwnzwob8TA0DCrpMo=; b=KYZJr+4eBwvf+JXxPFHfhc63dGsbV7+mH0wBWnuDHyWNWQceYvS/MxY0ER5S1xJAlL mPHv9ZpZk1WngUzR9ZjdU3IfGoOeIPIMPw57xvNmZ7SMvvq7oswao/YhhAk29jBnvCj+ SpwECLWGcl8KuDs0UraKnUrzXqpo0fzKzycQVrXCRcP9MbiKpQLgWGarMo1P4e7GpjLZ idVptPNBUXLmzfHb0sLpvdff+n8ODjbPO22hqKKSJlmYXSyYhSMY49w5Y3pjTMoydTGA k4+Pi0fYEJWxeLGmB4xhvaeYSSKIyYXInnMcBvHqhQnWWBWo9Px41Z0V0G3O4R/NPMzk B9EQ== 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 bo10-20020a056808228a00b00397fc21f0a2si275179oib.4.2023.05.26.00.00.36 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 26 May 2023 00:00:37 -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 34Q70R3e013306 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 26 May 2023 09:00:31 +0200 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v5 10/12] Set ISAR_PREFETCH_BASE_APT by default Date: Fri, 26 May 2023 09:00:25 +0200 Message-Id: <20230526070027.16890-11-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?= This makes Isar use `base-apt` repo in different way. Any package installation is done from `base-apt` repo, which is prepopulated from the external mirrors. This behaviour is disabled by default for downstreams. To enable it, set the variable to "1", like isar does in local.conf.sample. Signed-off-by: Uladzimir Bely --- RECIPE-API-CHANGELOG.md | 9 +++++++++ meta-isar/conf/local.conf.sample | 4 ++++ 2 files changed, 13 insertions(+) diff --git a/RECIPE-API-CHANGELOG.md b/RECIPE-API-CHANGELOG.md index 7a16b5c2..ae845674 100644 --- a/RECIPE-API-CHANGELOG.md +++ b/RECIPE-API-CHANGELOG.md @@ -492,3 +492,12 @@ Recipes inheriting dpkg-base now automatically have a bitbake target exists for the current `DISTRO_ARCH`. In that case the compat package can be built by adding `-compat` to `DEPENDS` or `IMAGE_INSTALL`. + +### "Prefetch" mode for base-apt + +Originally, `base-apt` repo is created only during second build when variable +ISAR_USE_CACHED_BASE_REPO is set. The repo is populated with every package that +took part in the first build and was cached in DL_DIR. + +New ISAR_PREFETCH_BASE_APT variable changes the way `base-apt` is populated. +Packages added to the repo before any step they are requested. diff --git a/meta-isar/conf/local.conf.sample b/meta-isar/conf/local.conf.sample index 7e0184e4..2d3c9c1e 100644 --- a/meta-isar/conf/local.conf.sample +++ b/meta-isar/conf/local.conf.sample @@ -215,6 +215,10 @@ ISAR_CROSS_COMPILE ?= "0" # does not access the network #BB_NO_NETWORK ?= "1" +# Comment out for switching to old base-apt behaviour when it's populated +# at the beginnig of the second build +ISAR_PREFETCH_BASE_APT ?= "1" + # Set root password to 'root' # Password was encrypted using following command: # mkpasswd -m sha512crypt -R 10000 From patchwork Fri May 26 07:00:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Uladzimir Bely X-Patchwork-Id: 2848 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:46 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-pf1-f188.google.com (mail-pf1-f188.google.com [209.85.210.188]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 34Q70h3M013392 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 26 May 2023 09:00:44 +0200 Received: by mail-pf1-f188.google.com with SMTP id d2e1a72fcca58-64d55045efesf74826b3a.0; Fri, 26 May 2023 00:00:44 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1685084438; cv=pass; d=google.com; s=arc-20160816; b=ZZuXkWAN20qXWjk0wgbmfxTKOt88l2LbXj/S9uv0YSIj9e20abmzT66sezQgmkwMQm 0QYPVq1cQjw2Zq+fh1z0sg7NN9QK/8M5Wmoml4LBO/1+AuOGJY1iKoX0mB6n21WIvANi aHGXMH7wVNIBZNrd0g1jvf6a3ZXzWTEzETh3tSOm92O9kuR2Bb4XuKL6RtcYl6vnWneS ZIuKBtHlTQ0q/Ng+3ij0IOGs9Vy5H9M41RpA8acmCF/HGXJ/Kz07bSU1bVdaIYfqxyPc 1kiYlt9fWcRHHSjnH46RequmKYmkUhfqcWb0fH/J5ELoPRn65SICRkb007xTKG3jEOdV QMAw== 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=K7CbxL3HiXp/AuumIfPUs87gPOfZKwYjDh6DNOX9avg=; b=LOAsewP+8LL5bLHhdlE9ZdzaQkJ7qoMm6pDh85AqX68Gd1+oUq73DlZNbnaVRpCzTg Cv6nJV9i73+dyp9xQghryb4M4TPtd+NFGhFLIgjSzA90CNeB7sxCXYMRplI8iSBUXZrb xCcTbFW1avR9fsqWzuM/PHYyxgG+ckhcqSDXrjldJANdyJ5aKgCchcevmJw9Kkw6716e 0pN8IxcFmc6htKuDmfjFmlUUYfU2YGis8Bu97DcuVCd4evnrTU3jmJYbqCIzQ0ebZ1/0 tQQlakUMf7fSdeVqKJu4/byX2oy9RFyY/mIZLCWhzrIehzhtdzPoR7sO2IGfT/aba2jf bLiA== 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=1685084438; x=1687676438; 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=K7CbxL3HiXp/AuumIfPUs87gPOfZKwYjDh6DNOX9avg=; b=ae9Ujadx6GFbtIskOKi0fZozrUANATqwUAaLwprpHG6lSlMWQNlAifvifZhV9See1A M9MhkrjQaTESFgrBwJ8witMdTUvbNnqY3ZlX34aTl1/mr3Y3z/9OuFoXIXZokn7DoL5w XwUB/vPyJoJtMJuhOi2H3sHDo//wJMXo7YcLhQkEY5CDCuq0XXZit4cI/gfha5FolgTd MaDSSjyULpvRfl8Ktn7nCUNoAfMAz8rCfgmCeJC/e6G7l2PrnvBOJC4lBJrSpO0hehur WwYKY4kK53ETrs9sLQWXVPWv0riKcy3o/l1Ytdo331eis+Lu8pNLwuVuCcNOa3QTieHM l9Fw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685084438; x=1687676438; 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=K7CbxL3HiXp/AuumIfPUs87gPOfZKwYjDh6DNOX9avg=; b=k+QOnRb1ynExCLh8ox8eWa3nHV17WqGNJPHWLv+JWjiQBEo8UC/it4KZMXTLxrB3Er kzbeWGeYLFJ2D8Ga5Sx4ASARsvvx3ERL+VJ0gIG2eofYtPzp5Lu0qCF96eN4F5lZJeNT aTU4c0BvG46KKuRb6zci9rSr8P+ytO8SpVYRVtODNjou6r3JGzYMjvq1wUmLplJ/nGN8 lveTcCZwcWBZCfkx4S1vt8sk8SAVzWOKYkP+jg3I9Zx1WCT4R11D5JqKzKnJXUv9kad9 Fha/381P6ZKoRJfFOZcIWm9WDhEwd0XToCQrFW5bahsQYH+Hkup+NEJreVLHa2l9Bldp 3PCA== Sender: isar-users@googlegroups.com X-Gm-Message-State: AC+VfDxhLeNBZ0tp+w9mvcPJOoddiAwS6CDDV8OrosT9PrK3OGtilZ58 NbEPa1uKSMDdye6JipXJOVM= X-Google-Smtp-Source: ACHHUZ6L1rIMNBI2RVkMAdbLbS9CD8RNsAFpV9lSlXxpaI75Nyjh9fLfZm/MndSzYGzl8YQFQq5+2A== X-Received: by 2002:a05:6a21:99a9:b0:106:47d1:63e6 with SMTP id ve41-20020a056a2199a900b0010647d163e6mr1236510pzb.3.1685084437726; Fri, 26 May 2023 00:00:37 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:903:7d0:b0:1a5:13e3:7b47 with SMTP id ko16-20020a17090307d000b001a513e37b47ls1151954plb.1.-pod-prod-02-us; Fri, 26 May 2023 00:00:37 -0700 (PDT) X-Received: by 2002:a17:902:ecc5:b0:19f:87b5:1873 with SMTP id a5-20020a170902ecc500b0019f87b51873mr1448273plh.62.1685084436892; Fri, 26 May 2023 00:00:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685084436; cv=none; d=google.com; s=arc-20160816; b=b57sFU3mBr6x4r4AOXR3Z2R6lNpYTk+5g2rdk41M8GtBl98Eabn9E0EDUjsWWvpaWz 5HUC760+/CGgfh/cpF922dmv3FLb6wobEs1ShwCuphlmtqIzTy88Uk48GNwPZIQkyf67 DJn3gYJLycjYdQXQplFozYpvQC+hYjxwUE59PD8G4Tlt2n3mD/iDnNRVU7WnWqxH7Opb aGV46JbzRaxVb0IKapz66jpUG7bkpZQ5HtOw4o28a3i2BlgPO543xSy6pIbFBSc9WVPh Ao8v6q7ncQaN3Novtr22s+UE/J35iFHqmTHpgjOZ2ecE2FexCd574g8n/b1XDr/qPpiy o2Sg== 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=s9O2CKLhP3eWApyQHw7yewxU5T7Ek0yvVvZY6wSAM7E=; b=UwmWOkyHcLVbou35qh9WzHN2oTMBgwtn7mVR6Xw9Xqtea+YHgooI+bxfWwd/touz1B hTLe5Rp/7kZ1NEaE62/kHidUlcgRHHMu628cI88CScAc6cMw29h0GHEFztZmAyeXO/CR Vzuo8uASU4nR2P9HZ5Fxa6fc3AN8Cl3jA+6F2Br6ZRSEX1zuZa+AV9kg+Xb7p0sfbMtq 74Cd62htLdC9XcX0N538jQDs+aYoIxDqo+EnQuV2QgSbVYef3V8aBeSEVq3i4zoKb1/f XdPgL7mg94BZDeqbePqfOC+N3itA/7n9+1vJZmpvMd8nH0xYv0vpRdu2fSy1eMZi12fl 6HXQ== 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 6-20020a170902ee4600b001aaf7c46645si225518plo.11.2023.05.26.00.00.35 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 26 May 2023 00:00:36 -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 34Q70R3f013306 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 26 May 2023 09:00:31 +0200 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v5 11/12] meta: Specify grub-efi packages arch Date: Fri, 26 May 2023 09:00:26 +0200 Message-Id: <20230526070027.16890-12-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?= When using python-apt, it can't mark it for downloading when used without ":" field, so we miss the package in base-apt repo. Signed-off-by: Uladzimir Bely --- meta/conf/distro/debian-common.conf | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/conf/distro/debian-common.conf b/meta/conf/distro/debian-common.conf index 5610dcd4..ee84b7dd 100644 --- a/meta/conf/distro/debian-common.conf +++ b/meta/conf/distro/debian-common.conf @@ -23,10 +23,10 @@ WIC_IMAGER_INSTALL = "parted \ tar \ fdisk" -GRUB_BOOTLOADER_INSTALL:amd64 = "grub-efi-amd64-bin" -GRUB_BOOTLOADER_INSTALL:i386 = "grub-efi-ia32-bin" -GRUB_BOOTLOADER_INSTALL:armhf = "grub-efi-arm-bin" -GRUB_BOOTLOADER_INSTALL:arm64 = "grub-efi-arm64-bin" +GRUB_BOOTLOADER_INSTALL:amd64 = "grub-efi-amd64-bin:amd64" +GRUB_BOOTLOADER_INSTALL:i386 = "grub-efi-ia32-bin:i386" +GRUB_BOOTLOADER_INSTALL:armhf = "grub-efi-arm-bin:armhf" +GRUB_BOOTLOADER_INSTALL:arm64 = "grub-efi-arm64-bin:arm64" GRUB_DEBIAN_SB_CHAIN:amd64 = "grub-efi-amd64-signed shim-signed" GRUB_DEBIAN_SB_MOK:amd64 = "shim-helpers-amd64-signed" From patchwork Fri May 26 07:00:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Uladzimir Bely X-Patchwork-Id: 2847 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:46 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-oi1-f190.google.com (mail-oi1-f190.google.com [209.85.167.190]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 34Q70hhe013397 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 26 May 2023 09:00:44 +0200 Received: by mail-oi1-f190.google.com with SMTP id 5614622812f47-38e551edfcasf418628b6e.0; Fri, 26 May 2023 00:00:44 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1685084438; cv=pass; d=google.com; s=arc-20160816; b=cd1pq0lqYwUO6A0iQ1UsM69P39Hq0KnY6TMZ6Xrhjt6mIX3F5Dz5R6k6m0qiakHKgV +Zw24Y+V46IbYbV2hSExC+XvdRP/IR4umf/YYiyzePnsKPkzD7pNhvrufYcelCw36sgy j1G03+PuqLbEYuDWVXIonMzwCLp2yBm01HkiGUhxrMPiWi/DAvGBudRgae7LrjjwFh0T WbjdDxK6chsm4U+CYj/EmCLlPcvo5AT+LDKM81dAXAX0UAI2iHIyHzYbLijXGwbhFByU PluOs6frsDBqyyfq3A3RicArzqXU5Ac/bDZsxvK55H6O971E0mubbiRNux6iDXLGPUry WJEA== 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=Wj+bkqFJtqqDkdhy4OzoH8GIaqaQAorhiFp97PJaErU=; b=AXrB+otnu2ix0PfTP1k1UEnT9PWUkSoCkfQgEQ78uIEnCl4lRuvaBM+648qewzrzv8 PksphogxStZIFW0HdPv+xt0gg7iow1eZviWwfosG5poXFA9JkdwwuQPN2QWdHLe72ZQl abS9Fb6M1EtsbGnkyYjudr8wjJYHdhM1IwzbWlXoCXZVk7cZncEvKnTKlvmBA+uOdmb1 hLge1yu4unDQIPK6VIo/Fh8zHUgYPacYb+bLSk3UOrdi+2Clz6dHCP24pWaNLb1y5ien q11ZPL7S4bmp+fIDF4sOfhaqEwnImkv70NOa0ORhK/DvIVTRqOJTHmoXIQFXKJMIea2W M5Hw== 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=1685084438; x=1687676438; 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=Wj+bkqFJtqqDkdhy4OzoH8GIaqaQAorhiFp97PJaErU=; b=C/Avs9zwgrYwu+zixuoRL0Em5J7ZiMB6zBISOUEDxs62W0VxFBQt7zbXiJOumACF12 jstInTMevyo4E8z+6Jxqak1vXJvdl2w4LuwtXp/4MObcap5nAUg1cRia59o50Tm1Mb97 lDVzI61ndWe+2TsUlv+fZb5s5cMBHePhPuFM4r1oh3n4VCHkzljUVwQw/l8ifnwU8Qhb SWXONUYoPDD65QqjTxQZ6WyAaFTkA8jZgX3QgWf25/1AjESRQooWyu/59CJLhvTJEsJe qDes3qm3V6Q4iVVW9EFZcwttWfGR1z7jH+ppAwOgCc/yrRCOQ18tQj8hCVT394imO3v1 cWWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685084438; x=1687676438; 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=Wj+bkqFJtqqDkdhy4OzoH8GIaqaQAorhiFp97PJaErU=; b=d+0lRUPAaCsd98Zr0FDLB1XS2ULt4dZNaVW2LaAdoNpAq3X6B2CGkHC+aM7OlAbQCf wW6IJ34cnW/GX7A4W0EVLxbQIrKW8KOWkF4RaiL/LFst5ht6UjDRh9cJMqUwgIPvlZi2 a3AIiduHNfcDs3Tt2q76etgJpRzFMc68MDiidn2cX79+FoeF6yspZJYH7s1AUPiHVvVn n3+g68ocyenenn9vx/2fokZJdvYdldFuuq5GVUESukstI1KW+P4N4In8RAExP0VdkqqV /wV5V5/pLIQ63hkXK9xCi3M36QIkZn4sOdC40FlqoDIlqPC5LHuOQhdZceOPTaz4GCnI V7Kg== Sender: isar-users@googlegroups.com X-Gm-Message-State: AC+VfDwtwJ1YIEf41jQKjvLhXZpIZ6PYHzyqEpFc/H4+aId4HXGtO51t 6md768TRIstUe+q1amgOxeU= X-Google-Smtp-Source: ACHHUZ515PBo2svbZ1uGZHDxsp9qFS0e0P5CXVbTTbwdEW2CTNwMH3yr/dgIbXPcsXkdpJoXQlmfPw== X-Received: by 2002:aca:a94d:0:b0:395:e7d8:c3fc with SMTP id s74-20020acaa94d000000b00395e7d8c3fcmr190248oie.9.1685084438122; Fri, 26 May 2023 00:00:38 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6870:701:b0:177:8f4c:3302 with SMTP id ea1-20020a056870070100b001778f4c3302ls958181oab.1.-pod-prod-06-us; Fri, 26 May 2023 00:00:37 -0700 (PDT) X-Received: by 2002:a05:6871:555:b0:19d:a4bf:dbb5 with SMTP id t21-20020a056871055500b0019da4bfdbb5mr427707oal.24.1685084437654; Fri, 26 May 2023 00:00:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685084437; cv=none; d=google.com; s=arc-20160816; b=OfjtF5qbB2bZB05tLvCZ1uDwCRzoyguzZrkLZ/RZcjC8OMKH47l4r85xcBHzsGCESx lOXhXacngReS3ad57KVNn8ZDMQRQzX0pqitjxfoRBCaM95f7AabPTeARke9T+AduqoJf bHH76SeD5W2rGHpJ8l9ixIRVMWwUSC+r85bKFgGQW/KM8ymatQscLlF8kfcotkdXDwJ/ lusvRfpas50WtIYBVOJVvGNEUhIUxS1geFqW6oQ+SLu5SHY+9PxsMQMbIgg0UdJqXab4 ixv1h4/1lvBgMt7QLyYwY6lGeratMCdRwiBFEpV2EOGLTwUht/qPZCLAWE3UJTgwZpl/ Ukbw== 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=gNCUP9w+FatygJUOKG8+/OWQXrocEpim9rUaUMLWts8=; b=JsaAOr/NZuSQo4V7uLgEoi+1k5xObSaXrGaSceMI7KGQyK7vNVWPuOjvCfbutAvi61 q4kwI37kQ4rYFcA2eTw/vT0JYNxy8ysqTZkbtUjDUVLKlxUzwCv3UAAFP7ac1MvwbgWJ cXz+3/3Ax06fJS9F6m2S4ReP3QkwjTYQoq2n+kNNRzpdElzZ1ChEPcKPNupgglJuYAXM heEmM+zvUBVF6Ak6MYVsVGVx3PmAKtlqnZN4eonpGheOEDxqkOaPNv9rtyFLcHudSqsI 7hexeV5hk6jZlHrFhIixXBcBPI0uSR2ZF3z7V+guxy7tXBWBYhT3fiUXwaIO5bSRMNCi WLSA== 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 el1-20020a056870f68100b00192c6345ea7si478448oab.2.2023.05.26.00.00.36 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 26 May 2023 00:00:37 -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 34Q70R3g013306 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 26 May 2023 09:00:31 +0200 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v5 12/12] Disable deb-dl-dir in base-apt prefetch mode Date: Fri, 26 May 2023 09:00:27 +0200 Message-Id: <20230526070027.16890-13-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.9 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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?= Since all packages and source packages are placed to base-apt repo during build, there is no need to have them in one more place. Signed-off-by: Uladzimir Bely --- meta/classes/deb-dl-dir.bbclass | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/meta/classes/deb-dl-dir.bbclass b/meta/classes/deb-dl-dir.bbclass index a7a8dcf7..54110cdb 100644 --- a/meta/classes/deb-dl-dir.bbclass +++ b/meta/classes/deb-dl-dir.bbclass @@ -87,6 +87,10 @@ debsrc_download() { } deb_dl_dir_import() { + if [ "${ISAR_PREFETCH_BASE_APT}" = "1" ]; then + return + fi + export pc="${DEBDIR}/${2}" export rootfs="${1}" sudo mkdir -p "${rootfs}"/var/cache/apt/archives/ @@ -104,6 +108,10 @@ EOSUDO } deb_dl_dir_export() { + if [ "${ISAR_PREFETCH_BASE_APT}" = "1" ]; then + return + fi + export pc="${DEBDIR}/${2}" export rootfs="${1}" export owner=$(id -u):$(id -g)