From patchwork Fri Oct 2 07:01:06 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: akarpovich X-Patchwork-Id: 5513 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Fri, 02 Oct 2026 09:05:05 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-wm1-f55.google.com (mail-wm1-f55.google.com [209.85.128.55]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 692754RH003842 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 2 Oct 2026 09:05:04 +0200 Received: by mail-wm1-f55.google.com with SMTP id 5b1f17b1804b1-4a0228f4a1bsf9712255e9.1 for ; Fri, 02 Oct 2026 00:05:04 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1790924699; cv=pass; d=google.com; s=arc-20260327; b=qeuRmAZikFXvu4Ry51S9A0HfLl0jL5+Y+dq/RKqj0vu7Rc2Bva25acZF2ie3l46Kqd ADzsjprgEgpodAkjmf4zuDgfG+cQFX9Uigy5Hiusfm/o4QUp+SDVWBpwtAYy+EWDIAZJ NARSyyUBqLaBek0HT7xdsJnxzJKFZzeSswLKDz1nUNNhaI7DrmnejSozIBCiqIs5s2Q+ q2vhI1+KS+CUaNlMmeQofjRUczyL+RgdoRNKSi6KSe7VjR+N//lHbvQhprJun4WDyLmj eRXbwyZyJb9sqWfzLfqpa9jI+1oW8eYUmg/kbfd3l3vYjLi6xfKpeIYZ6y1zJFstBV0l 2Jew== 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=OV0vr+CFWjOG1RHQxC6X2ep2X64E/OK2BZ/Qne/wYa4=; fh=nIeSBR+1KqFziKnwzM+Aaaqyk0daFcEn0zMywM2qTGM=; b=n5bK635CbxDkSdsSbejixWhmmvyegNw0GpodhzYfTHv/mjLR5hlRExnKFK4+/OjfWY MOCoNYIa6cLOz/dd3Nxu1sIqYKOfoAe79xSkmExN2nSMRlJJlc+sC0xaijIRHSDP08YR fESiIukTE/LZCGVr50SgWD0BQ86nJ6n5KVcJcAi9CYjuiVCVtH2jkBXzWf2NGAjSbrs3 2ZshaZT0364oKOYdNUMjmZf9d8ZARxcHDqQUry4YU+5CuXzh6GWAHejAxDGjvp75qQGB I05ktXoYSY3h6Ag6d95ngNrMuAAoneGJ8b+g2fhbLf3vXov/Z1ZQA2nViOOXGL3WSvvq 02NQ==; 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=1790924699; x=1791529499; 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=OV0vr+CFWjOG1RHQxC6X2ep2X64E/OK2BZ/Qne/wYa4=; b=hvsyJmRln8Q5UKwxqyME+t73SSUL7Eh9ysdZqVo8N5ib4iiNTTaHacWc9WdNVNZYTE 36SzjhgctIOBhFx+XIG6MV23/W+9cw9pJMuu9JbhRUcaJvaQESuOGPncatyvmJQ185O0 OFZqTMRABHsJ0yEDRyyQbL/uvkZXGmDv5Al3F0SxZYDzvMwDyCk71y+OcFMa+ic4TgEL nkKUX4cuHsMbp2CQ2C2Bsl5XNMyD5rps3r/HqLL9f1MLJUX9N9NqgwTi9lRe2OCr2Vsv mkpzqJ0btFPrhEONXh4dimnE1nZkMvWYaoTKpT08sdLNAby60uMrYgbz5pKW53CAwnGD 5jMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790924699; x=1791529499; 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=OV0vr+CFWjOG1RHQxC6X2ep2X64E/OK2BZ/Qne/wYa4=; b=W7yzPO4CpaZ0UPe9cZ43qM29g5oWvSlfMfm+dVmXDE7GXvl5Y8sQFBKGBWEYy7lc2j obnkYGv5y3tFdeMwLsbK1f4CFQt3yzMjuQ9PZ326cUQimE9fcVaJVOR4fqo6cl6QvI5Q xpg0SBESLRZC1awv9o/pscBrpSs1lQQHTqHmLBNmZ0uYexdsJ1R36AaD8bK+UC8WB/u1 3CJvPjULdqqsxUOm/JPv4eKn/b7TivXBE9kUmPB/wepf23ad/fXTFdaoDru4qTbXBp0H nNpYmh3XykV0FSXMh8ryT/N3IDedOMhHIyLgt/BKfN6p8q9X8MUS4rOeplrg8FCvjU8d P/ZA== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AKwUvBy3PmZmOJzvXG9B0zYRyNeXxZzwKDryY0Lmk2G5K+SYJ6Ps/HPQEwxKHiOXuhoefxv21z/TVdk=@isar-build.org X-Gm-Message-State: AFuF++krCtNtdcnJ2BB6kXTTrrQ0OlpXycySg3RLgXSf85IAV192Tdtb xJyIYRSmrMtfaZWaBRBGBk/i86kWAz3cIhYiaqgqL9YPr+pf6Bvq/zof X-Received: by 2002:a05:600c:4ec6:b0:49d:1cc7:5ec3 with SMTP id 5b1f17b1804b1-4a02756637cmr32240465e9.9.1790924699091; Fri, 02 Oct 2026 00:04:59 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com; h="ATskLdcyqWgdXGJPJoV5E4EViODVLhADolL1q+ZDsX70IQhVcg==" Received: by 2002:a05:600c:37cc:b0:49f:fd51:d81 with SMTP id 5b1f17b1804b1-4a028522102ls5255435e9.0.-pod-prod-02-eu; Fri, 02 Oct 2026 00:04:57 -0700 (PDT) X-Received: by 2002:a05:600c:993:b0:4a0:1fb9:2f51 with SMTP id 5b1f17b1804b1-4a027579559mr22255855e9.14.1790924696937; Fri, 02 Oct 2026 00:04:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1790924696; cv=none; d=google.com; s=arc-20260327; b=AMidUrO3AzAlPF9Ec4ikOnUsUO+/sXfVbNhUj1DKOItSHuU/dM7MkAH49+xKnNNEqP cdafq3vTx84EgEOgYVzhrdq1eLaBnC6a+Mh8fMnVg8eDBZGl7jRvD6ZwEncGsz6MRfHu 1y21TBTMU4rUJf6XH4JITrmoRa7m7n+gziPqDHQb3H5Zd8AqiB6vVSCn8Bt0o1mBkr99 AceMmuH35poAI7X+9f1A0vglDzoFQ15Kgh+HgBVGi3qXJKTqFrn1TZTvyeuODp+JmmgF Q+2aSteYWxo+b0+R2lU1tw2IGw9NvDKb6UbGjxt9//ZBusQYBmWz8zqd0tRnqGmQXuIs G4WA== 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=mCdlnoF9LNspukmPnqCjY9Qrscd7la6o5+9YbL0E/cM=; fh=8xvFQ9N6ENvazHnylkO2sbgzUV6bRnZQvNiaC5bb+x4=; b=YrwPW9jYc75t3EhLjLghbXHa8YTLeoQOwV3O6jVZ7SKTLG+njJijLgIpTZiijyW73j WA3L/UqKbjpZEhJB/sYC0+aUH/yaTMC1bmyiVwo0XxsFV5ZS3PGvxi98/FS+XCTBbjUh YCDRV/xFwMFq57l+p0NOt0CpIbM93lOcHNbjr2Hx/NnbOQss4WIb3FsonsWCFtLdNFoE Xq4Pv7Ys+7SbaxSu8/+8imDvnt1z9Wxp1guinwwI3Mk7o2phEvYxglcIxyymUzjW5I+C NgZmVXtmB+rD7phryBy7yk3VSWodCOtaIvPdDWGEYHx6w00dXC5MdAfHgSIhQDbi/tW4 9iVw==; 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 5b1f17b1804b1-4a03ff09c09si158245e9.4.2026.10.02.00.04.56 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 02 Oct 2026 00:04:56 -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 laptop-0xxx (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 69274a1i003799 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 2 Oct 2026 09:04:55 +0200 From: akarpovich To: isar-users@googlegroups.com Cc: Uladzimir Bely , Aliaksei Karpovich , Aliaksei Laurynovich Subject: [v11 03/12] meta: Always use base-apt repo in local mode Date: Fri, 2 Oct 2026 09:01:06 +0200 Message-ID: <20261002070335.26526-4-akarpovich@ilbers.de> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20261002070335.26526-1-akarpovich@ilbers.de> References: <20261002070335.26526-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 bbaafa01..6aa3a103 100644 --- a/meta/classes-recipe/rootfs.bbclass +++ b/meta/classes-recipe/rootfs.bbclass @@ -75,7 +75,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 6135da4f..9423ee72 100644 --- a/meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap.inc +++ b/meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap.inc @@ -157,16 +157,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" @@ -187,9 +192,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():