From patchwork Thu Aug 20 13:29:18 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aliaksei Karpovich X-Patchwork-Id: 5388 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Thu, 20 Aug 2026 15:42:02 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-wm1-f56.google.com (mail-wm1-f56.google.com [209.85.128.56]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 67KDg1cq013651 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 20 Aug 2026 15:42:01 +0200 Received: by mail-wm1-f56.google.com with SMTP id 5b1f17b1804b1-49991beee7asf24224045e9.2 for ; Thu, 20 Aug 2026 06:42:01 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1787233316; cv=pass; d=google.com; s=arc-20260327; b=Z8PaNjtP3Q6JboDeoDwdsQRD94GVEF6yfjXpT/lotNceml3WBTsm8tIwbYVPLkc4mI DXdttUx/lKZCYR4L8QxV6l0T2eJI3s735w1tsMu2clWettlrIV9FXELURpcI9SKlm+4c fQzCqStZVEhc0i0fe1VPQ02YkBGyyHQ0Fv5qTB76gNz1c/YrzrcjKOtK/ZkkA55ZR+zC KSjbrRzpDvyWXk+A7BJgEByHdLcKI87j/pwF2/bnTmSggF4KGY/YMoeCiYVfgDfrlJ8Y 2JjWxD/CsLqmqWW8vavaOKyFBTQ35pzDXG4gq7fg8wD+8+LNvxmrM+iHJ7A/8bD1XL14 sR4w== 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=RAScsTHDtSI8R1w9PBNZfySxeetqKKZ0YYDGDPzpwyo=; fh=yvnjgzau63aaJLoiODrRar5/oKVtbzzwZkpETla48cM=; b=I+I0xPx2M0HBeGaLAXRo5g4wcy7GzrtWF2vpXqTP2fbzipDHK/Bi2wCHJiAB49EF0N G29quMT0IjMfbAX6kfCwvzDI1eADV5Raph12l/fQ7lMPPIkK3AoO/JhQC3Gah7snxV65 OYZJa1XK4fJwg/fusR2OdW/bObjN+aVBSiXP5J5ztAo/1+JEV0GHfpIooHfPrZ6FOC1j Jdftm5nsCHwBM/y+0ZA4fZn1pyoSVLpBd2KrJJkaAdnry8gM4XTjvyiwfsFeCWDDoqx+ UdiXIgQxyRrcXWdcibKmzzcrjXw9GbkT9klH/RDxkUmZq5iAuytLQ0sDCZ4/tWlL+Vae Ftsg==; 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=1787233316; x=1787838116; 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=RAScsTHDtSI8R1w9PBNZfySxeetqKKZ0YYDGDPzpwyo=; b=K/8ji7Df/MhcrK0otSrycPe6EZluLC1a0j/tIxuu0IflqUIZFs+DspX4ES5+axq3lt /fmgpDX+IdGwpnt7PwKiXBvdDeveULAnmlLYYq5aLYgkPAhftEisNqCojtS6mKHKQXuN yKqAiUVnrhDDnrsdLcJ+2Mh4w44JUUS3V661qEXT97KGWu/3ojNFkqGsmYbUi8xtA96Y Iv4wMgeEvl0pYHy00+fqnEO5AEzGsF6XcxjPaeyb4Eg65ZCp97dl1Lb/6vTm0sqaXTIH hdF3563onXLLaatDow4Oqjuh0I9h1ed6gxsVPEckH87TV1e8zqiIxg13rLmPWa9iE6En /Viw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1787233316; x=1787838116; 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=RAScsTHDtSI8R1w9PBNZfySxeetqKKZ0YYDGDPzpwyo=; b=VxBOg3XFdPFQGySzLFTyRgMw1W2s2SeADnoNIbsHTYZ3KIGldt7xirQixmLV9VAeTm ARhYdLvpA0G21gmNBaXWnTXdXXg6/f/+84nACbbqDfRAnexqEZR2l0fab+vjqy8aB3wZ onE7Xak8vhNKFoiFtDwU4GNfYMN1sUsrwaARW4JFhkPkY5aRrrDTUCkmAxPzHx7GT4mP oSfu0L6Mlgwm5EYP6aeXalgyicf+h2EpYhNhVLoJRSG2jL1uR1vr8eK1sCh4jGK9KneQ wPoDtcUsEtreabD6xcYVpshopceaTP0Milen41y0CpCegOiIO/MK9Gt91F/CoTfOwR1/ /z3Q== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AHgh+Rrm2jYaU6VjSR5jAWwto/Q933LDzLYE4PmZxznfl8+1dbeMueVUZbkvLpjCTqp83ZqdGJp2jxM=@isar-build.org X-Gm-Message-State: AOJu0YwillgzCWABNfCHAalSu+ZWkuCROEOJ7UrtRvCB/9hCFQ/mdKkZ BeUf8LVM+33DzQr6osXFEetYk+DmbgMgRUCfyw6lJgNOqdUAOd5wOzFe X-Received: by 2002:a05:600c:4713:b0:499:83f1:398 with SMTP id 5b1f17b1804b1-499aa1e247emr180492905e9.9.1787233315939; Thu, 20 Aug 2026 06:41:55 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com; h="ATskLdeMAXWMvZG8fduBjNQr3qr2OXTwYPSM8W7gsr5lbZACkA==" Received: by 2002:a05:6000:70a:b0:479:e6a8:c0fb with SMTP id ffacd0b85a97d-482b78b621cls838601f8f.2.-pod-prod-02-eu; Thu, 20 Aug 2026 06:41:54 -0700 (PDT) X-Received: by 2002:a05:6000:4008:b0:47f:8f8f:db74 with SMTP id ffacd0b85a97d-482b1fd9704mr20621695f8f.12.1787233313704; Thu, 20 Aug 2026 06:41:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1787233313; cv=none; d=google.com; s=arc-20260327; b=OZg+xuTY7PcA0rXAvx+gXwbFneftK2JcVO5FP3BN0oByyr7Lgd3eTA/tSYeN7KmoBW HBT2lkiF/EwxRNkWT+g5LIxqqJ1+aXbPfW8kg9zpKfjWyU2WefcxQUi3XHhZb5s2VkpP msEtM5GuDNRJGrMS4NwwY1PdUY+rcOc8yRaTpoDs9GVplAjx0Ucefzc1Maz1UJKK5V1Z gbI4yzv7W0q1re/EsbDhLtHEHUwZi8kdxl8gYm2jCZJNImzOdTQ9DxbyGOVnhholdz/U +6TILH+KraF43fSfHQYQk+I4UDeYzpNALLhdA56YhSjLBCBQOEf/9QIvlksLOa3w1KNJ +YUg== 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=G3ir034zB1T9z2HBCQOJ244dU3gGtKh1hG2Y5z66W0Q=; fh=8xvFQ9N6ENvazHnylkO2sbgzUV6bRnZQvNiaC5bb+x4=; b=mlpWKkCTUUOQwFVvq+J0k1y2vuf9C8zaq7vrb93IMyZGlSOij2LmowvVNSMqTSuQor nGxAhauYsyejsvnEjvxx78mIX9GAGjYunXwX3lRF5QLSWfFqGcRX3AHQIQ+qUcSig7Pg v047ubyVXm1F8PizLZCIMnqc28UJWpwVnnEaoLKyGygVNb+RV0e+rRNZBO0Q7/Jnj1VU pCe/xPZljsbzJfXqnTrzhUj3IjKf7J4YPM/RDhAFa9A1Bz+klax7BX1HYcbBTP7/LIkx ISvYUa5nfP2LvIc+P8+bw88M3Uf1LI/uDX99JgI0xIInRNDb1I8d3jWx8Wjo9XRTFBIq WqSQ==; 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 ffacd0b85a97d-482b14bced8si90568f8f.8.2026.08.20.06.41.53 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 20 Aug 2026 06:41: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 67KDf8lQ013513 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 20 Aug 2026 15:41:51 +0200 From: Aliaksei Karpovich To: isar-users@googlegroups.com Cc: Uladzimir Bely , Aliaksei Karpovich , Aliaksei Laurynovich Subject: [v9 03/13] meta: Always use base-apt repo in local mode Date: Thu, 20 Aug 2026 15:29:18 +0200 Message-ID: <20260820133934.383231-4-akarpovich@ilbers.de> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260820133934.383231-1-akarpovich@ilbers.de> References: <20260820133934.383231-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 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 Signed-off-by: Aliaksei Karpovich Signed-off-by: Aliaksei Laurynovich --- meta/classes-recipe/bootstrap.bbclass | 6 ++++-- meta/classes-recipe/rootfs.bbclass | 3 ++- meta/classes-recipe/sbuild.bbclass | 3 ++- .../isar-mmdebstrap/isar-mmdebstrap.inc | 17 ++++++++++----- meta/recipes-devtools/base-apt/base-apt.bb | 21 ++++++++++++------- 5 files changed, 34 insertions(+), 16 deletions(-) diff --git a/meta/classes-recipe/bootstrap.bbclass b/meta/classes-recipe/bootstrap.bbclass index c1a59fd2..f853a932 100644 --- a/meta/classes-recipe/bootstrap.bbclass +++ b/meta/classes-recipe/bootstrap.bbclass @@ -39,7 +39,8 @@ python () { # installation afterwards. However, bootstrap 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() @@ -121,7 +122,8 @@ def get_apt_source_mirror(d, aptsources_entry_list): # this is executed during parsing. No error checking possible use_snapshot = bb.utils.to_boolean(d.getVar('ISAR_USE_APT_SNAPSHOT')) snapshot_mirror = d.getVar('DISTRO_APT_SNAPSHOT_PREMIRROR') - 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" elif use_snapshot and snapshot_mirror: premirrors = snapshot_mirror diff --git a/meta/classes-recipe/rootfs.bbclass b/meta/classes-recipe/rootfs.bbclass index 8d394b05..99328b12 100644 --- a/meta/classes-recipe/rootfs.bbclass +++ b/meta/classes-recipe/rootfs.bbclass @@ -62,7 +62,8 @@ ROOTFS_MOUNTS ??= "${REPO_ISAR_DIR}/${DISTRO}:/isar-apt ${WORKDIR}:/isar-work" python () { mounts = d.getVar('ROOTFS_MOUNTS', False) - if bb.utils.to_boolean(d.getVar('ISAR_USE_CACHED_BASE_REPO')) and not ':/base-apt' in mounts: + if (bb.utils.to_boolean(d.getVar('ISAR_USE_CACHED_BASE_REPO')) or + bb.utils.to_boolean(d.getVar('ISAR_PREFETCH_BASE_APT'))) and not ':/base-apt' in mounts: base_apt = '{}:/base-apt'.format(d.getVar('REPO_BASE_DIR')) d.setVar('ROOTFS_MOUNTS', '{} {}'.format(mounts, base_apt)) } diff --git a/meta/classes-recipe/sbuild.bbclass b/meta/classes-recipe/sbuild.bbclass index 6db29251..29a8dd71 100644 --- a/meta/classes-recipe/sbuild.bbclass +++ b/meta/classes-recipe/sbuild.bbclass @@ -44,7 +44,8 @@ EOF cp -rf "${SCHROOT_CONF}/sbuild" "${SBUILD_CONF_DIR}" sbuild_fstab="${SBUILD_CONF_DIR}/fstab" - if [ "${ISAR_USE_CACHED_BASE_REPO}" = "1" ]; then + if [ "${ISAR_USE_CACHED_BASE_REPO}" = "1" ] || \ + [ "${ISAR_PREFETCH_BASE_APT}" = "1" ]; then fstab_baseapt="${REPO_BASE_DIR} /base-apt none rw,bind,private 0 0" grep -qxF "${fstab_baseapt}" ${sbuild_fstab} || echo "${fstab_baseapt}" >> ${sbuild_fstab} fi diff --git a/meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap.inc b/meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap.inc index 994da174..4d61e9be 100644 --- a/meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap.inc +++ b/meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap.inc @@ -153,16 +153,21 @@ do_bootstrap() { fi E="${@ isar_export_proxies(d)}" - if [ "${ISAR_USE_CACHED_BASE_REPO}" = "1" ]; then + if [ "${ISAR_PREFETCH_BASE_APT}" = "1" ] || \ + [ "${ISAR_USE_CACHED_BASE_REPO}" = "1" ]; then base_apt_tmp="$(mktemp -d /tmp/isar-base-aptXXXXXXXXXX)" bootstrap_list="${WORKDIR}/sources.list.d/base-apt.list" line="copy://$base_apt_tmp/${BOOTSTRAP_BASE_DISTRO} ${BASE_DISTRO_CODENAME} main" - if [ -z "${BASE_REPO_KEY}" ]; then + if [ -z "${BASE_REPO_KEY}" ] || \ + [ "${ISAR_PREFETCH_BASE_APT}" = "1" ]; then + line="[trusted=yes] ${line}" fi echo "deb ${line}" > "${WORKDIR}/sources.list.d/base-apt.list" line="copy://$base_apt_tmp/${BASE_DISTRO} ${BASE_DISTRO_CODENAME} main" - if [ -z "${BASE_REPO_KEY}" ]; then + if [ -z "${BASE_REPO_KEY}" ] || \ + [ "${ISAR_PREFETCH_BASE_APT}" = "1" ]; then + line="[trusted=yes] ${line}" fi echo "deb-src ${line}" >> "${WORKDIR}/sources.list.d/base-apt.list" @@ -183,9 +188,11 @@ do_bootstrap() { \$1/etc/apt/sources.list.d/*.list && \ mkdir -p \$1/base-apt && \ mount -o bind,private '${REPO_BASE_DIR}' \$1/base-apt && \ - chroot \$1 apt-get update -y \ + chroot \$1 mv /etc/apt/sources.list.d/0000base-apt.list \ + /etc/apt/sources.list.d/base-apt.list + flock -x ${REPO_BASE_DIR}/repo.lock -c \"chroot \$1 apt-get update -y \ -o APT::Update::Error-Mode=any \ - ${@'-o APT::Sandbox::User=root' if d.getVar('ISAR_CHROOT_MODE') == 'unshare' else ''} && \ + ${@'-o APT::Sandbox::User=root' if d.getVar('ISAR_CHROOT_MODE') == 'unshare' else ''} \" && \ chroot \$1 apt-get install -y dpkg && \ umount \$1/base-apt && \ umount \$1/$base_apt_tmp && \ diff --git a/meta/recipes-devtools/base-apt/base-apt.bb b/meta/recipes-devtools/base-apt/base-apt.bb index 06b1f6c8..05ef9741 100644 --- a/meta/recipes-devtools/base-apt/base-apt.bb +++ b/meta/recipes-devtools/base-apt/base-apt.bb @@ -59,9 +59,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}" \ @@ -69,14 +72,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():