From patchwork Fri Sep 4 07:52:46 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aliaksei Karpovich X-Patchwork-Id: 5420 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Fri, 04 Sep 2026 09:56:06 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-ed1-f58.google.com (mail-ed1-f58.google.com [209.85.208.58]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 6847u1Jn004198 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 4 Sep 2026 09:56:01 +0200 Received: by mail-ed1-f58.google.com with SMTP id 4fb4d7f45d1cf-6a5d46edd1esf658693a12.1 for ; Fri, 04 Sep 2026 00:56:01 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1788508556; cv=pass; d=google.com; s=arc-20260327; b=kJEfwzYS6JvZtmjLpJa09elr1whG/STzbMHZFTUCCFES+4kcNH8RnDeU0VrCdJVb0A Ocwq9HskhPnuiGDZ27UWMaV8OqlkHUFbnuMJzsYUzwDQJMy5IgS8oy2I2Ptj0/oqXEDC vb+OQv9bIniYcPp3LS5Z9Fgw6myc4AqxaFCEPybOI605f+a16xkPCYN7wvaaGQKhtc9Y 2XT/w2CzTVEPv8LP6JF9LCFeSPhbCug0BWF0Nb33WE7+9U7bJTBP3dKud2/dn2SuObdC 9J1VcZbBTRyIySzbOPLa1gae9DrZ/1Mff4FZhe7Xj5qs56AvfCcxnPzv/tRW4JJ8IE8V cVww== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20260327; 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:cc:to:from:sender:dkim-signature; bh=NNojQUm75dnAtGjG2nccBfygNNXq1A9k9aJYVP52zJA=; fh=bCtn/v4S9sfQ3b2nVDbV0uRc1LQWp3LG30GLfMXm904=; b=YPQ7QWGaqHhBGKEXBiHPhpBg2h4kjoFNUDLPrLZAqyQ/0NQ47I1r3TsRejAQ8W1ijE /nRlhho9KNyDjGWW6oX1WvG8zhefoIcgnG0Lc8Xdf99A7deOi6mrFDmkZFOney87rlse 7IlWyV7bLc9etuol0wtXmO3lRpPjx1WLK7PyoqGI7+I7DCGRoQ9xNoDqWZAp2h+P2ZeB UE3TWXK5GeTdHY81arkuEgK91wjN0OLbr+bAwsDFWQC1P6N4ohV1GYlcdnr/GQmhsJIm IJe+ZgTDMrg+HR0K6LY2CuTR+8UgAb1VtMvOQeHxIUUiLyrfqkLtRyMXTIz0CLYglPv+ UyAQ==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of akarpovich@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=akarpovich@ilbers.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20251104; t=1788508556; x=1789113356; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:content-type :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from:sender :from:to:cc:subject:date:message-id:reply-to:content-type; bh=NNojQUm75dnAtGjG2nccBfygNNXq1A9k9aJYVP52zJA=; b=pbWLHDXhzC4PU9FOZwaBFiJZaziDlsySgqUm7GMBu3lzF+y0t7QuScMDNavNhvrDyO AxjeYYzxl73/6dMleXMtsBP1F4s/v22DkMx2wO3KiadKfxx+SWmozX4CQE/zKQte5cs1 Ajs4My6S8kif1bwH4miyCCClwWGnrGhFETAPgGTC2+KL4dGA66FskQ46blZdqgxA474t oODQha/4WpVrVPuLnGyaQTmkpcy/ojXIngYtsTcnP/IJJXOkXBCc4P+ALzQTYwBQDw2/ FWoa8wynUWzP2mOk8hr9xENfuFEMmJRVEGmPNf+F3GmIEYcxjL4R+QpN6TxBHDJWXYER QIZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788508556; x=1789113356; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :content-type:x-original-authentication-results:x-original-sender :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:x-beenthere:x-gm-message-state:sender:from:to:cc:subject:date :message-id:reply-to:content-type; bh=NNojQUm75dnAtGjG2nccBfygNNXq1A9k9aJYVP52zJA=; b=eJCajMV6jkU5TrcIz5CQX7bHYBha3aa9eNwui6L+z/Xkt2Hrssg6V95e/w/Wk+M3bB GfQlq2K1UXgEFlybeu3pwnsZ0doc53SHwqK5bPHyM9k7E2yfNl2fDemMTXlyMGpB9nhu +fE0kJ96XP13MEkVk8MQW81TWiTxdQ8sl+V1qKr5IKwx26DigbqXFDtsdKyOpp4TGQXH +K59FqdudHnINn1pxaYP7fbnXybcczefkin5Qq4cx+gvxtPKh6JipaKiGyrgMgsBGaZ9 hEjMe3cOsI27XA8L9bImNPJr8c0ycdhmXkCfpNK2hi4fgDLkDKc/nTG2g5IxfIwzQRI6 d9rA== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AKwUvBzJYl68QFXNLHCsLtAahRYUc8Zze/B7D/u7VbcvO5PkEYBH7mcYjBkFlC1Ce+exTGAba/YBMlc=@isar-build.org X-Gm-Message-State: AFuF++kkaoVDXZQfbUH7NMNWOs7fk1phmumvYBu7AgDicBqXfo7KuJBg bqesuNr87ZaquUW4e5M+/PQ4W5NfOUR1e/riruLdlmge8CRU9VS8AMIU X-Received: by 2002:a05:6402:f0b:b0:6a7:ee54:f8a9 with SMTP id 4fb4d7f45d1cf-6a7ee55007dmr372373a12.45.1788508555903; Fri, 04 Sep 2026 00:55:55 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com; h="ATskLdcL8ZJA15CrJb7qJamwyuGu22LEIfxd6Pw+ie+uoWIxYw==" Received: by 2002:a05:6402:46c3:b0:6a3:8652:a348 with SMTP id 4fb4d7f45d1cf-6a7e5476b66ls935198a12.0.-pod-prod-07-eu; Fri, 04 Sep 2026 00:55:53 -0700 (PDT) X-Received: by 2002:a05:6402:324c:b0:6a7:ee54:f897 with SMTP id 4fb4d7f45d1cf-6a7ee55003emr411525a12.27.1788508553457; Fri, 04 Sep 2026 00:55:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1788508553; cv=none; d=google.com; s=arc-20260327; b=SDgoL7UtzzKosNBnUFj3G2lSBXYoXc0I2w+1zrZnIwFFRdwYIwCb+SqJCo2G/5bh7Z k5IlfHghGB348fPfmjjpZveXn/Ddb3eKoiwLIqq3XweGfVH/L5DuVBIhF5xAkllcBKEh 0JgoFMjcvrhdxNRlJSTxUxB+pBBmAJsuNyA+ErnR4Cja0W/M9dHJxyC5I/i4fjMyTPxJ 4n3ul1yCOlgmXCc6GggmMhMo2lgQy5oJMdFUMWDHNI7GBOLkv90eVStww/w+7uY4UJjA /Y+1DLKeDl1LzOQCSFOXxaEm7BRhOKhBHqQ/Tm2YddoAgJNV2Yo8z7oZ+f42NawZWGUv Ew5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20260327; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=c7tUl8Ha9JUC7r7/gBbyym43wDKTBFWPjeZIpPemO9E=; fh=IIbR0JxonYgzdrHDdB9TmZniSh/o1z0HofhfbmLXp8s=; b=mEexQRmc/rOAqMwodK3T3KfgsrKy66pbGswlfDDe1W5ygLb/+JIzejClCRVahdM85d frgGC4KRhc23nHcgc9d8a6etLnp1XeZw4xA6vWpQ6vL+EJ1qjNw6AEE6cfrMrKlag35d qKxcDwDP7GpIQbtF6iO1YiDARh5DAX929Z8dbi2RfQaDaT5uPSzArepHUrf19kV8u49z wylvTQs144gQ/oqCZoacq3ltsEsH/gRMAzeuxVSh/lBh2v4D0fNMQcICHnVKhtPB982C 7/eqgtbisXL7Ou7RvFy8FneptFWz4zWnNK6fUdICgDba2xaNjXpwJ3oY8R6V1S71F1GD msUQ==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of akarpovich@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=akarpovich@ilbers.de Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id 4fb4d7f45d1cf-6a7e687c201si43092a12.6.2026.09.04.00.55.53 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 04 Sep 2026 00:55:53 -0700 (PDT) Received-SPF: pass (google.com: domain of akarpovich@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Received: from akarpovich-Victus-by-HP-Laptop-16-e0xxx.promwad.corp (62.122.174.6.serverel.net [62.122.174.6] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 6847tRSE004124 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 4 Sep 2026 09:55:51 +0200 From: Aliaksei Karpovich To: isar-users@googlegroups.com Cc: Uladzimir Bely , Aliaksei Karpovich Subject: [v10 04/12] meta: Use cached base-apt repo to bootstrap Date: Fri, 4 Sep 2026 09:52:46 +0200 Message-ID: <20260904075515.25962-5-akarpovich@ilbers.de> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260904075515.25962-1-akarpovich@ilbers.de> References: <20260904075515.25962-1-akarpovich@ilbers.de> MIME-Version: 1.0 X-Spam-Status: No, score=-4.6 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, RCVD_IN_RP_CERTIFIED,RCVD_IN_RP_RNBL,RCVD_IN_RP_SAFE,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: akarpovich@ilbers.de X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of akarpovich@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=akarpovich@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?= From: Uladzimir Bely This patch makes local base-apt repo to be created before bootstrap task. So, bootstrap 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 Signed-off-by: Aliaksei Karpovich --- meta/classes-recipe/bootstrap.bbclass | 44 +++++++++++++++++++ .../isar-mmdebstrap/isar-mmdebstrap-host.bb | 2 + .../isar-mmdebstrap/isar-mmdebstrap.inc | 2 + 3 files changed, 48 insertions(+) diff --git a/meta/classes-recipe/bootstrap.bbclass b/meta/classes-recipe/bootstrap.bbclass index f853a932..10cb23be 100644 --- a/meta/classes-recipe/bootstrap.bbclass +++ b/meta/classes-recipe/bootstrap.bbclass @@ -16,6 +16,7 @@ BOOTSTRAP_FOR_HOST ?= "0" APTPREFS = "${WORKDIR}/apt-preferences" APTSRCS = "${WORKDIR}/apt-sources" +APTSRCS_INIT = "${WORKDIR}/apt-sources-init" DISTRO_BOOTSTRAP_KEYFILES = "" THIRD_PARTY_APT_KEYFILES = "" DISTRO_BOOTSTRAP_KEYS ?= "" @@ -223,8 +224,51 @@ python do_apt_config_prepare() { aggregate_files(d, apt_preferences_list, apt_preferences_out) apt_sources_out = d.getVar("APTSRCS") + apt_sources_init_out = d.getVar("APTSRCS_INIT") apt_sources_list = get_aptsources_list(d) + aggregate_files(d, apt_sources_list, apt_sources_init_out) aggregate_aptsources_list(d, apt_sources_list, apt_sources_out) } addtask apt_config_prepare before do_bootstrap after do_unpack + +inherit debrepo + +debrepo_bootstrap_prepare() { + [ "${ISAR_PREFETCH_BASE_APT}" != "1" ] && return + [ "${ISAR_USE_CACHED_BASE_REPO}" = "1" ] && return + + 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_ENABLE_COMPAT_ARCH}" = "1" ]; then + debrepo_args="$debrepo_args --compatarch=${COMPAT_DISTRO_ARCH}" + fi + + if [ "${BOOTSTRAP_FOR_HOST}" = "1" ]; then + debrepo_args="$debrepo_args --crossarch=${DISTRO_ARCH}" + fi + + if [ -n "${GNUPGHOME}" ]; then + export GNUPGHOME="${GNUPGHOME}" + fi + + ${SCRIPTSDIR}/deb-repo --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} \ + ${DISTRO_BOOTSTRAP_BASE_PACKAGES} +} diff --git a/meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap-host.bb b/meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap-host.bb index fa4b76a6..52563d33 100644 --- a/meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap-host.bb +++ b/meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap-host.bb @@ -17,3 +17,5 @@ require isar-mmdebstrap.inc HOST_DISTRO_BOOTSTRAP_KEYS ?= "" DISTRO_BOOTSTRAP_KEYS = "${HOST_DISTRO_BOOTSTRAP_KEYS}" + +DEBREPO_WORKDIR = "${DEBREPO_HOST_DIR}" diff --git a/meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap.inc b/meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap.inc index 4d61e9be..c452035f 100644 --- a/meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap.inc +++ b/meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap.inc @@ -147,6 +147,8 @@ do_bootstrap() { fi fi bootstrap_args="--verbose --variant=minbase --include=${@','.join(d.getVar('DISTRO_BOOTSTRAP_BASE_PACKAGES').split())}" + debrepo_bootstrap_prepare + if [ -f "${DISTRO_BOOTSTRAP_KEYRING}" ]; then bootstrap_args="$bootstrap_args --keyring=${DISTRO_BOOTSTRAP_KEYRING}" cp "${DISTRO_BOOTSTRAP_KEYRING}" "${WORKDIR}/trusted.gpg.d/"