From patchwork Thu Aug 20 13:29:20 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aliaksei Karpovich X-Patchwork-Id: 5390 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:04 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-wm1-f63.google.com (mail-wm1-f63.google.com [209.85.128.63]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 67KDg3c6013667 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 20 Aug 2026 15:42:03 +0200 Received: by mail-wm1-f63.google.com with SMTP id 5b1f17b1804b1-495529a93f9sf19750465e9.3 for ; Thu, 20 Aug 2026 06:42:03 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1787233318; cv=pass; d=google.com; s=arc-20260327; b=Y6ZiSSlKtfo6Jwm/4VCl+2iD2Llb5Ri5fLI1Gag2oz1qwD83yO4jSpzPyYPDaUoPFs Vb8m8lYMCsFTM39IHcalOnrC59JawvY1wzl2diHzXc7m5nyCnNF9uEh5WlcZXJu3NBEB Be6MQJavlgORZx+c0wOKcmnj1IssU7/PY9zFJehU1kzy8vurBPwrZkai1PsdFudIEFm2 xWISbnZCQpn6jz4CAOMwVAS7fGVVCwayPEZL/EqqNKFvjg+Wpkqd8+qz92Sl9APUxNVd Km8pTHf2sBZ07/62rsI2T0+k4Ya1bpZ0xZL1oOwhEqZyO15lEvdFS1oiTUjY3NQZXNpg 5CHA== 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=tTN6Ftkg9iMoo9o0fdP4Re/ord1gauZBBGAo+0Szxg0=; fh=NuYtVPXMtxZVzEG3YUpzKBmC9LrwLRs/FDscfrlEpAU=; b=eG/+8JzwSACq2wzAa109Mv3ETB8WPdjzmvJzqGfJ9Cwri3JUXzw40M+QbItudh2paG bjam4jTx6AaRJM9B4f5ZKdIJcZRZpfZiP+Ab+OEoyxYNyLEoLmx1f+fYp8VAIFSZng8Y FGASXxQlWmccG3LdVomE0LLgjpadgRokuTg+MAXq023cSbkzcE3yxpzkOqxPUz7Nq9GP l4TJIqxmX50ngytjln2MKWsMU8buExtKnk2g6p53h7teIjKFI3GOhun11Q6HZhzuPN7a facRYrCtvdFK7FpNM9t4gRrpyG0NajZTZVwFFEsfc6tAdFmFrLl6pZKbWB5IA8cPxtoW kdGA==; 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=1787233318; x=1787838118; 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=tTN6Ftkg9iMoo9o0fdP4Re/ord1gauZBBGAo+0Szxg0=; b=XwkCMc0MrvZNbDl+/l7ufSZthPIxtaOaEIPWdeIoJrBR7SzmyQHe4GYu86Kvh/+gA/ Hm8FvEbxYzzQK38VFXIkYypQ2XuzEnLvZk9RkYxZDERecBUi+7E2X0AcZt4roVV0WZj+ dPoA5bu58vcbF1nwezQa0MesDqKpXMuQgP16c6nGlY19zNGqh6JxuRpmIT2xs3IO5apX 9GTcA5dSyGbgIMViTTxQeYJE43MkX4VjpLPvAqGH/1K45OeQ/l78FV9v+RgAmj4Tdeus ZmBeYendIVl2IVHw2gZZXY5bYJCLiEyiYHGGOgWqxie9D72H/cpawVWbqZik4eZl/TEF QIMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1787233318; x=1787838118; 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=tTN6Ftkg9iMoo9o0fdP4Re/ord1gauZBBGAo+0Szxg0=; b=H3kiVHtmlErYBjm5lNLiuz7X6ec5m3Pa9U1v9FCTstFw8LYbYP0/5LhzPznnSN6aKo 9K1P6LT8GiQ/co4bQ/COFKF/vG8vkZ9gpl1KE4OJCXyawyfy4T9gbA8xUGjTHK/8lJtW t47tDrS4GD63uHWaPDxz4pqMVBKnNlFKFvXbvmXD6D4TfBLsnMHNA/xcajC+9JaiggvK BXPrxQzRn3xdPZQnMtidZMOcMudEoeeoFcXnFOggRf2gw4KmdxrbpUoHlqbX8QmLE3T3 2CmAFM4nASbB22ZMG4QVK5K+it9fduvNr9lODc/GlVtSEcRvm6K0mAK8JL//PT32eXz7 pf9Q== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AHgh+RoMMJ+hrZo0vHVx9VB/3CAs6c0UALyIEhyy2Zut0z3EfnP07SJ9b8ECGms2PeAdVVSHX+f931A=@isar-build.org X-Gm-Message-State: AOJu0Yw8oy/y/bTx3ammHi6Kdz9N292tUEg7QqwV1heC91A57eZAUdQ8 2kOAUl4K97NQLuEBrAbfJm5A6nyWOywfpJQ7OUI1whq4sho0HmMS+fmn X-Received: by 2002:a05:600c:3f18:b0:498:1595:be7b with SMTP id 5b1f17b1804b1-499aa194df0mr242788465e9.4.1787233318467; Thu, 20 Aug 2026 06:41:58 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com; h="ATskLde1KzG0ygyM68iYk2Ncq+F6h4hOhgUtS5v+7M1PXD15HA==" Received: by 2002:a05:600c:1392:b0:495:47b8:80f0 with SMTP id 5b1f17b1804b1-499b0595656ls9170875e9.1.-pod-prod-04-eu; Thu, 20 Aug 2026 06:41:56 -0700 (PDT) X-Received: by 2002:a05:600c:1908:b0:499:5210:c537 with SMTP id 5b1f17b1804b1-499aa17d6d8mr204004735e9.1.1787233316372; Thu, 20 Aug 2026 06:41:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1787233316; cv=none; d=google.com; s=arc-20260327; b=csTouWAudnxxuUNcyT75VeBIEgOf9xAds4EBQd6gvpH0qfQE5sZ1gFIBqQFriwnpLc otlaIxOJsCNlfdJlLHz395QBnrqC3yDemC+7t7iVYFaw6Ji/Ex6avZJGc6ip8Pv9JABV HXOj6O3gfrJ9O0VOvw3BBaPxn7K0ehclnzK0hqCw7xYMqIpJdufM8sTV/EINmLRrx+tn D1Gz4qWCUzgaHztqhONV5rZfvo5D4RL4cv+VU6PGJfzDONTd2GdlOQJ7iA6ZHHsl5/xW yQrdnebHxXZNhRYYITLrGaSzOOQ3e9Y8V0s1Dw4uTFIcNEZsLFR5uhU8N3uIp1q+dY63 MJZQ== 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=V9K++Fw/aAiCliUdex4fEMod6D/MEEYsuMlBBuZvG9o=; fh=IIbR0JxonYgzdrHDdB9TmZniSh/o1z0HofhfbmLXp8s=; b=JoKrDwZPDYfZarwdyACbbqEA+Et4fdVMmVaJ5HeqkczkLgtrbiRtQMPDnpLq13vmeX FD6yuPvto7SNYcgjzETcWXLxKXpbmwJ9QzOgIrgAoDIJhmTDAGXqcZ4laiqE/MiX3RcD zAQ2RszJjYdG3JOTdtWD8hmzdxsR1Z6iK1MjZQqK7jB2qxWD8kZ3xYypH081o9rvfX+M 4nOhUSpllSp8HLFlQYBnNPlubr329zaEsRMe3JcMg0yevfCQod7yetJMikD0z4BuOM/y rrFijZPo2R7fasn9YC4JbHuKr8+5NAGWPBtnpPOUJ0zQSDpSunlL7FohE5F6dGf+Dl9g KkgQ==; 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-499a9e70e00si1107445e9.0.2026.08.20.06.41.56 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 20 Aug 2026 06:41: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 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 67KDf8lS013513 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 20 Aug 2026 15:41:54 +0200 From: Aliaksei Karpovich To: isar-users@googlegroups.com Cc: Uladzimir Bely , Aliaksei Karpovich Subject: [v9 05/13] base-apt: Predownload packages to base-apt before install Date: Thu, 20 Aug 2026 15:29:20 +0200 Message-ID: <20260820133934.383231-6-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 patch uses debrepo script to predownload packages to base-apt repository before they are installed in rootfs. Signed-off-by: Uladzimir Bely Signed-off-by: Aliaksei Karpovich --- meta/classes-recipe/crossvars.bbclass | 1 + meta/classes-recipe/dpkg-base.bbclass | 1 + meta/classes-recipe/dpkg.bbclass | 8 ++++ .../image-locales-extension.bbclass | 5 ++ .../image-tools-extension.bbclass | 13 ++++++ meta/classes-recipe/rootfs.bbclass | 5 +- meta/lib/aptsrc_fetcher.py | 46 +++++++++++++++---- .../sbuild-chroot/sbuild-chroot-host.bb | 2 + 8 files changed, 72 insertions(+), 9 deletions(-) diff --git a/meta/classes-recipe/crossvars.bbclass b/meta/classes-recipe/crossvars.bbclass index 7cf2d660..6f070714 100644 --- a/meta/classes-recipe/crossvars.bbclass +++ b/meta/classes-recipe/crossvars.bbclass @@ -30,6 +30,7 @@ python __anonymous() { schroot_dir = d.getVar('SCHROOT_HOST_DIR', False) sbuild_dep = "sbuild-chroot-host" + flavor_suffix + ":do_build" sdk_toolchain = "crossbuild-essential-" + distro_arch + d.setVar('DEBREPO_WORKDIR', d.getVar('DEBREPO_HOST_DIR')) else: d.setVar('BUILD_ARCH', distro_arch) schroot_dir = d.getVar('SCHROOT_TARGET_DIR', False) diff --git a/meta/classes-recipe/dpkg-base.bbclass b/meta/classes-recipe/dpkg-base.bbclass index 4a81787e..91b17768 100644 --- a/meta/classes-recipe/dpkg-base.bbclass +++ b/meta/classes-recipe/dpkg-base.bbclass @@ -11,6 +11,7 @@ inherit terminal inherit repository inherit deb-dl-dir inherit essential +inherit debrepo # Local (WORKDIR-internal) dir where do_dpkg_build collects the built debs. # Its content is exported into the shared, sstate-tracked DEPLOY_DIR_DEB so diff --git a/meta/classes-recipe/dpkg.bbclass b/meta/classes-recipe/dpkg.bbclass index a42703d5..323202e4 100644 --- a/meta/classes-recipe/dpkg.bbclass +++ b/meta/classes-recipe/dpkg.bbclass @@ -117,6 +117,12 @@ dpkg_runbuild() { echo '$stalled_pkg_timeout = ${DPKG_BUILD_TIMEOUT};' >> ${SBUILD_CONFIG} DSC_FILE=$(find ${DEPLOY_DIR_SRC} -maxdepth 1 -name "${DEBIAN_SOURCE}_*.dsc" -print) + debrepo_parse_dscfile "${DSC_FILE}" + + 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 # networking is automatically enabled on older versions of sbuild sbuild_network_option="" @@ -139,9 +145,11 @@ dpkg_runbuild() { --chroot-setup-commands="rm -f /var/log/dpkg.log" \ --chroot-setup-commands="mkdir -p ${deb_dir}" \ --chroot-setup-commands="find ${ext_deb_dir} -maxdepth 1 -name '*.deb' -exec ln -t ${deb_dir}/ -sf {} +" \ + --chroot-setup-commands="${locked_update_cmd}" \ --chroot-setup-commands="apt-get update -o Dir::Etc::SourceList=\"sources.list.d/isar-apt.list\" -o Dir::Etc::SourceParts=\"-\" -o APT::Get::List-Cleanup=\"0\"" \ --finished-build-commands="rm -f ${deb_dir}/sbuild-build-depends-*-dummy_*.deb" \ --finished-build-commands="find ${deb_dir} -maxdepth 1 -type f -name '*.deb' -print -exec cp ${CP_FLAGS} -t ${ext_deb_dir}/ {} +" \ + --finished-build-commands="mkdir -p ${ext_root}" \ ${@ '--finished-build-commands="cp /var/log/dpkg.log $ext_root/dpkg_partial.log"' if d.getVar('ISAR_CHROOT_MODE') == 'schroot' else '' } \ --build-path="" --build-dir=${WORKDIR} --dist="${DEBDISTRONAME}" ${DSC_FILE} diff --git a/meta/classes-recipe/image-locales-extension.bbclass b/meta/classes-recipe/image-locales-extension.bbclass index c03f34c0..32b5e19c 100644 --- a/meta/classes-recipe/image-locales-extension.bbclass +++ b/meta/classes-recipe/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" + run_privileged_heredoc <<'EOF' set -e ${@insert_isar_mounts(d, d.getVar('ROOTFSDIR'), d.getVar('ROOTFS_MOUNTS') if d.getVar('ISAR_CHROOT_MODE') == 'unshare' else '')} diff --git a/meta/classes-recipe/image-tools-extension.bbclass b/meta/classes-recipe/image-tools-extension.bbclass index 8f666444..229ce318 100644 --- a/meta/classes-recipe/image-tools-extension.bbclass +++ b/meta/classes-recipe/image-tools-extension.bbclass @@ -6,6 +6,11 @@ # This file extends the image.bbclass to supply tools for futher imager functions inherit sbuild +inherit debrepo + +python __anonymous() { + d.setVar('DEBREPO_WORKDIR', d.getVar('DEBREPO_TARGET_DIR')) +} IMAGER_INSTALL ??= "" IMAGER_BUILD_DEPS ??= "" @@ -60,12 +65,20 @@ imager_run_schroot() { echo "Installing imager deps: ${local_install}" 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 E="${@ isar_export_proxies(d)}" deb_dl_dir_import ${schroot_dir} ${distro} + + debrepo_add_packages --isarapt "${debrepo_workdir}" "${local_install}" + debrepo_update_apt_source_list "${schroot_dir}" "base-apt" + ${SCRIPTSDIR}/lockrun.py -r -f "${REPO_ISAR_DIR}/isar.lock" -s <