From patchwork Mon Jul 27 11:26:23 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aliaksei Karpovich X-Patchwork-Id: 5288 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Mon, 27 Jul 2026 13:29:14 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-lf1-f58.google.com (mail-lf1-f58.google.com [209.85.167.58]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 66RBTCA2001015 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 27 Jul 2026 13:29:12 +0200 Received: by mail-lf1-f58.google.com with SMTP id 2adb3069b0e04-5aec6240ddbsf1638429e87.3 for ; Mon, 27 Jul 2026 04:29:12 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1785151746; cv=pass; d=google.com; s=arc-20260327; b=B3qxCqTTFwtEruACmfEAuyYD7vXR9Vl+1X9vGCMyGdxHOjvOLTSwh9moPt/8L6e8iJ NrDwoR+tmEgfdYxDfEu5JenpZMwO8s/c8ivEwOlKDYo8dsPIZeRg6YWvwbu1JtixT3bS wwcviO5eCDqjO0G0ffu3Gvfvsh/w3KVN9CZcaQmQGRuMPoF5FeXhGBxqJReqECpXd7zO KBcRuoj/bFiwwWATquilITcuAF+mASRCyLhV9yKw3ryxo3mZ8/f0/KmVq3vNgE89BUDs AnkctiiDOKJprUimlGjlxsG3pveSTew2H1WiKoEgBJlad2s3X8HLne0fxky7EMYVtrrQ XtGw== 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=nWzRY+lLpA/FU+1+Ng/oGfF1R208glyA7nJ/6JJrYFw=; fh=KboI3GDwQnfTmn+Ixb+Tvj6YNBmeNAbONAv86hQCmOA=; b=qkJg6Poy3Ed1Xe9ebkL/AoqX2XDXSmhGp5YJspnInCfBYw+hdQXNazbZdDdnTeFNZc grNeYWC2DN9mGM75bTQxLiAfyEvzoaBve/eCDLYlWx5kM6Seb8t7i8HFQsVErGB4nY+Q 7OQxe2xF7FN4lXIh84D5jK3fKzwAyQogozWhMsTL5NeuiabSdOytNLH3zwqZwIigEwaJ o9Kjdk8GhR/YPoeeZXLF9KEZ2wm//WwtVJJ1SsnIFv5INQewOO0kGxLMLzwhBhPQB7hm ETbgYRDfDcbPi4YkTOjxcJ+Frzd8oDAXUvf/h9I7IWEy6Ezo7TjMjzPOuLxj7CWGeMYP 8prA==; 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=1785151746; x=1785756546; 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=nWzRY+lLpA/FU+1+Ng/oGfF1R208glyA7nJ/6JJrYFw=; b=OAROyVMNJtsBr+AmsM90I9MxOS4qYb+xCXXZTyKnS9TmdDMfg3MCX1gFqctiH71BtR OjrgEy4Y1F9mhjQhQf+xd995keAzA32X46p9HLSDKsili0FqYRQd7RhWVPYcEk8aLg3W Lx3XvJhcfuDsiqaGjjhmd6vHgeE9rjd4IQpKX/ctwiHFi/mjfO2Wa7BQiYF1AMSJedV1 qIhAdGusnRaLDRG9M0Z0AkBSwgtLPFI/NU8JNP+PtErXCPnx5LzqT/EAsKQuaX7EkdxI UvcnJ1gObStBu9hh4Czl55XfXyUZsrBPschUzjMa/nqGRWVFZk1AlNAdqxm7rXmnp/Jm D18g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785151746; x=1785756546; 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=nWzRY+lLpA/FU+1+Ng/oGfF1R208glyA7nJ/6JJrYFw=; b=V501q4yaehuBPWwBeRLMLw3hkNO62Q0pOv5b2UVUgMn9HVUqJnuQj/ol2duo4oVpSy e12amkJJuUTJ5IaSBIGjKaWyvLaiBtnuKVG8jMy+MFoFe67Psy4Semv7PcibLw63JcgZ 7t6P5ZtJuKLmBegpcJpbwaMphpdnt2yB+V+e6hUUJjuioxUBZ74dwD5IeD7ZyvO/7Evy cDtwekGVI0JL6BOpnXpObwbQDsHhuitSqD6HMnofjIpGWIG0Exc08ZS+zZXmEhL6iStc f1i3NB+FNpb1yyEQ2ewseBLkWLASYhfA7584pYC0h+RZ1f+HNsNrDE3bWN6sNQ0kRuKT 8YYA== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AHgh+RriOLSIAt6rZOKHFJd/Uxb3mQZX/SZIlumWSoM7SUTPYXC8cLcpS3xsl5gxirJHqxV9QcCylp0=@isar-build.org X-Gm-Message-State: AOJu0YxUkaqdaNXaQyBrFZUCitcfIx0zxfer+eekt2Z6Vun5+V8nVw6X JKYgAogf2n56HFOv14KX2rY2uzUFT8mDwYhzktowidyVIXca1lcehDyV X-Received: by 2002:a05:6512:3b0a:b0:5ae:b887:bb33 with SMTP id 2adb3069b0e04-5b2c1af7884mr1649187e87.1.1785151746461; Mon, 27 Jul 2026 04:29:06 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com; h="Aa7YSPSevrFMDWv6NLcKK5c6LQuaLA491NY+GIYai9f+yWDe7w==" Received: by 2002:a05:6512:6411:b0:5b2:9d66:8c2f with SMTP id 2adb3069b0e04-5b2b02835c4ls1483846e87.0.-pod-prod-06-eu; Mon, 27 Jul 2026 04:29:04 -0700 (PDT) X-Received: by 2002:a05:6512:3094:b0:5b1:5f7e:1ca2 with SMTP id 2adb3069b0e04-5b2c1b29759mr1571752e87.32.1785151743947; Mon, 27 Jul 2026 04:29:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1785151743; cv=none; d=google.com; s=arc-20260327; b=Wsk70LsTOVpPmRVnlPcgeW1tlSPSQYQ14lTmDQ3ZFQV20FkCYKzCi13MfrAK19YMaP A7whhfv80xol4oCs2ebSPSbTfy2uNakZqbnG7+opewGkRN/4UA7diL4Gsqk1sDnRx6nD zhqigCW2Zu4EWTgEYYLbclQIuv0Doo2IrDAWmdlyQO0yxCUbGnoyU/LxJUTaDFuyT8W0 T/Cxya6GgReDT6dPtmhBWVJGyxPcmm5AzXxo05eM7ydvsEUtCP8W2UtmIPAIbgp2J/PH tXFw75iq4ls3hOvIdfCZhvuN3HBuXTCRPUpghGsAwvlNxXuBWqH2Ids0ccCSPuMvvpti nr+g== 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=BJ76rBL0j0MGkHUtpSZtkVlxZ9PCxw9XEFuPQ+u6Px4=; fh=2ALxNboLzDt503PhX56nFQ4pQzOkkVjVTCOSpqCio6o=; b=iS3Zcm0fsdErC8Pzm2WMAR1zJv/4R9QTW1tfycjRbFhOhuOUbBzY9q5yhmqHGAFAUd E+d78D5cszWb4DFTjA0WLldaqaWjbelxU+F/Z3SUPVrnhmjppP9sy6VJxlOqquNNDU+T oH/FsgUN8Zy8k6jxve6eD6D5H0tpczeqK0+TE9/SkvsEi7XONP5x04Edt+zhu7AQfLmn 4+jy6gJiLSe0nUQRcW06lIdczoSKKbus9M4NxwIKp2ImeOeYKgLAlHTYCFp1+f38L5Vj Nwq/q55JI+olFeaB8XHRJAlmVHtniyaCdCoyMIYlNtJg4DKgDMnRBUCKMqacz5brmsEC 0lmQ==; 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 2adb3069b0e04-5b2be0cc58asi153055e87.8.2026.07.27.04.29.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 27 Jul 2026 04:29:03 -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 66RBSjdV000930 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 27 Jul 2026 13:29:02 +0200 From: Aliaksei Karpovich To: isar-users@googlegroups.com Cc: Uladzimir Bely Subject: [v8 05/14] base-apt: Predownload packages to base-apt before install Date: Mon, 27 Jul 2026 13:26:23 +0200 Message-ID: <20260727112812.2255297-6-akarpovich@ilbers.de> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260727112812.2255297-1-akarpovich@ilbers.de> References: <20260727112812.2255297-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 --- 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 | 22 +++++++++++++++++++ .../sbuild-chroot/sbuild-chroot-host.bb | 2 ++ 8 files changed, 56 insertions(+), 1 deletion(-) 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 e2ed4dfb..cda3bd2b 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 DEPLOYDIR = "${WORKDIR}/deploy" diff --git a/meta/classes-recipe/dpkg.bbclass b/meta/classes-recipe/dpkg.bbclass index 1b2616db..e885a743 100644 --- a/meta/classes-recipe/dpkg.bbclass +++ b/meta/classes-recipe/dpkg.bbclass @@ -111,6 +111,12 @@ dpkg_runbuild() { echo '$stalled_pkg_timeout = ${DPKG_BUILD_TIMEOUT};' >> ${SBUILD_CONFIG} DSC_FILE=$(find ${WORKDIR} -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 sbuild -n -c ${SBUILD_CHROOT} \ --chroot-mode=${ISAR_CHROOT_MODE} \ @@ -124,9 +130,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 c75025ca..78118e8b 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 ??= "" @@ -50,12 +55,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 <