From patchwork Fri Sep 4 07:52:44 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aliaksei Karpovich X-Patchwork-Id: 5421 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:07 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-wm1-f61.google.com (mail-wm1-f61.google.com [209.85.128.61]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 6847tvLV004177 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 4 Sep 2026 09:56:03 +0200 Received: by mail-wm1-f61.google.com with SMTP id 5b1f17b1804b1-495689bfcc8sf5097525e9.1 for ; Fri, 04 Sep 2026 00:55:58 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1788508552; cv=pass; d=google.com; s=arc-20260327; b=HR1nvKbXOnjm+46sD9g2a8ahCdJsa7j7Ir9xTpsBtJEI4I45eiyqGQI9V7sYvAbhAb /1D9Y7dqhw4cwdw1v22oVxb19BY4fSdnt4KAipAtq0i0lR61/5Sy3NfUEp2shCliQABI 03ECOlCiMjW8wrYazbt0PxGIZL2dgfh2yIA9QY6rDSaJGbidVRqKNuLKoNkxQQbUlwdT 3kSLqgOONn5e8jWx/RTHVwpFPSTYM0oieF/44zsdEotcskUTrGszC5HxzcyVQKfkKPaR m396any7EYqwC08sqU9mQShL6qjHqu/TtEaPugqaF2ynbMIU1IF5gdMOGq3iI3c8nrnn ta/g== 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=6llZNBkutMZ69UhXXzDqAvHiJT8FO3zGBvozI8oATY0=; fh=in7aU7jtfadUpF602xcgYbOQB5SgT2suuwC0r82qaHg=; b=NjPkaWaGyXeLAU4Q3b/jBr68J5xESgs9g/rn/9526CBhPkekTSs0k7PEozDmYDYOMO Ox5A+GFrwZpJQzutiZnrpc/ahYxrvANL2VXowdjyXzu2lITUeeM7fMOhosCtOff3RJTc MppgUQ7S2pm1Eb22wzVZVcCe70wkS9H/cvZVT44rGyHTGg/4sIIkwj+D57gdZ1wr0TlH MaWuYZRqEkuiCmjSTbFoHTULODVlScigYEgzu+hG23bMZIVhlD3sS4gBc9IvyTEoklPZ Z+DNQWCDj3KPXdN8iFxAyb9zOMKSuho4rhZmJB4YB/sS4iQDDEpYnP+kzI3wARfnnTyd xgYg==; 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=1788508552; x=1789113352; 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=6llZNBkutMZ69UhXXzDqAvHiJT8FO3zGBvozI8oATY0=; b=D2ehqAcCBXXdZo+7hWY3taA6cWgFJdTIHcsiKetukdFUS4LWCcU2RSW3eN29uz3BZe vhgkEXAG6qVBmIXmf+NP30VACh2RH+YvQPka3QW83g0vkWyqc9ySAcLHUpvwB8eo1vEM mHGUcJYVYS8CfZBp3ZyZ2Wj3yOGztVzJyWACySK5fkVM/9g4HDTJ6UtvD9bB9+YIvduV 2RJhAc6+mnTIuqPf7Gk6zPhqTVqxLYgySkQfyqoWug0wgDleA9TtYjZsz2mddAHxCF0o iYIIF0adibFJnDyRxkw4R1ubwkgzgyThWBTugpo7ho3eAYVBY3HiSrxN118oLn6YHREa p+Vg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788508552; x=1789113352; 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=6llZNBkutMZ69UhXXzDqAvHiJT8FO3zGBvozI8oATY0=; b=sSvcbrdzyqMQdUPolLymNrgLZVYUzF0Dg6cQLrFvKoyd1jeOlEQLN5kbFsyWir+ui6 qspLbEi4KcSfeAXRJzQpfoVegUIaql68ZupxPJsPG4n0hfbk40m8ykcGxyECw7IBhQkJ Q93s1sqrFlxxkrw2EWSk7tRvtScsJJcTuRfiP1VP7B6ovqMphudZa+OCZ8/OtM76h1I8 zwepBMbtny/7S7pyk0mzEmM5YJSC72Iom+VUJdFm3aHpdSfKYWXXhyDZ3Y4FUVe8iRJk sqgfr4RlfCELL7M0aa7JB6RlDgjULhd8/KVioIjz24rJSRogvBcmKoY+9H2pz7sAmUNE xA1A== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AKwUvBxYx3dO4Xsq0ED8aUONR15dUa8KEStK920bOP0YEjZswy1S7R1oBhO4suIF2MuxhmW6HzOQ/k0=@isar-build.org X-Gm-Message-State: AFuF++nxSf3ahlOeg1Nwbe3Ww9mYUx9g+0jududKoVn7HL7yaNGfwoh4 VER7EPMJaJZw9Pe309JjVDmuUHa0zFnA1HsVrlA/6QGer2/C7LldRL4q X-Received: by 2002:a05:600c:3b1f:b0:49c:ee06:9c58 with SMTP id 5b1f17b1804b1-49cf821eff7mr37807335e9.4.1788508552385; Fri, 04 Sep 2026 00:55:52 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com; h="ATskLdfj2L38VVVope+Xm0uwkC960GE/dYfqaGCLdG1YigERIg==" Received: by 2002:a05:600c:3b93:b0:495:5f00:94cb with SMTP id 5b1f17b1804b1-49cf6887dcfls7239995e9.2.-pod-prod-03-eu; Fri, 04 Sep 2026 00:55:50 -0700 (PDT) X-Received: by 2002:a05:600c:3488:b0:49c:fa21:e745 with SMTP id 5b1f17b1804b1-49cfe764152mr1016275e9.27.1788508549867; Fri, 04 Sep 2026 00:55:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1788508549; cv=none; d=google.com; s=arc-20260327; b=Z9eb5/S5UgG+kkH0duHkFSvIHGV02TOVStOFvg4hDzNKZvmUkys1ORS+TwDMnQONcQ 91alcxneHDeNcKKQWlylKNQ/oRY3SoYpuBZvZJYkdYn2b68nUA9gxieSjrHv2djnB9sV 82VWHq6LuLveQ4LuN2dijFQw/4U0amwm6WH5+Z7i5bTdQAaXD1RfBMnl8v4zEPkgppyf M8pG7qZ790bV+YOe2QtOCbzFEldS+efheBt90c98Ia4SJS4XRXBoxsLBck+WhYh7GiwY WrhYvTr1zTmrqbZfmyegZyMasdMwOWyzDF/JxPTZsGggpjMTBYVbuSkHqzSjoFvlER/5 Tu+Q== 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=cohjnP7Ibv3Xi4YpM0Sm/IAJ4GxHx0S4U7vmVCC57uo=; fh=IIbR0JxonYgzdrHDdB9TmZniSh/o1z0HofhfbmLXp8s=; b=leUPCe8BMlMWcVRPegOqd2MLfTLj5qoRgHyTALHwRxbIxYSRIMxqkOIiWqCFUKKNRr yKHTSwzgEl/noocyyUnO44CRFnbygUsw6xBav2Mcj55ed1wvgrN9VFwpiM5xRCEk7wZV eVIdlRCWjJOvedPFSW+MrsTrwn8kmu8SIXyp2zwJtvz4XB+V/VL2rN+zihD4x+vGFFFl 0YH5PPWEsGC4YOjJgbAypsSIINrDWPX9cDd3WpfnRE6IADvCK8M6aUUTWJ8eEAimLRU6 q9NPWE+wKie5YRE++1WunN4KIA0z9XSMqWkTK/lQzvv0eHzeuZOegJiK+ySxTqX2Bd0x QnTQ==; 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-49ce47b2d77si1233245e9.1.2026.09.04.00.55.49 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 04 Sep 2026 00:55:49 -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 6847tRSC004124 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 4 Sep 2026 09:55:48 +0200 From: Aliaksei Karpovich To: isar-users@googlegroups.com Cc: Uladzimir Bely , Aliaksei Karpovich Subject: [v10 02/12] meta: Add debrepo bbclass handling base-apt prefetching Date: Fri, 4 Sep 2026 09:52:44 +0200 Message-ID: <20260904075515.25962-3-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 class uses 'scripts/debrepo' python script to prefetch given packages or sources to local base-apt repository. Signed-off-by: Uladzimir Bely Signed-off-by: Aliaksei Karpovich --- RECIPE-API-CHANGELOG.md | 9 ++++ doc/user_manual.md | 1 + meta/classes/debrepo.bbclass | 89 ++++++++++++++++++++++++++++++++++++ meta/conf/bitbake.conf | 5 ++ 4 files changed, 104 insertions(+) create mode 100644 meta/classes/debrepo.bbclass diff --git a/RECIPE-API-CHANGELOG.md b/RECIPE-API-CHANGELOG.md index 2db05169..139fcc8b 100644 --- a/RECIPE-API-CHANGELOG.md +++ b/RECIPE-API-CHANGELOG.md @@ -1201,3 +1201,12 @@ To opt out, remove the feature explicitly: ``` ROOTFS_FEATURES:remove = "clean-apt-credentials" ``` +### "Prefetch" mode for base-apt + +Originally, `base-apt` repo is created only during second build when variable +ISAR_USE_CACHED_BASE_REPO is set. The repo is populated with every package that +took part in the first build and was cached in DL_DIR. + +New ISAR_PREFETCH_BASE_APT variable changes the way `base-apt` is populated. +Packages added to the repo before running any task that need them. Separate +`deb-repo` script is used for populating base-apt repo. diff --git a/doc/user_manual.md b/doc/user_manual.md index f3b1acb9..5cb942ad 100644 --- a/doc/user_manual.md +++ b/doc/user_manual.md @@ -86,6 +86,7 @@ apt install \ gettext-base \ git \ python3 \ + python3-apt \ quilt \ qemu-user-static \ reprepro \ diff --git a/meta/classes/debrepo.bbclass b/meta/classes/debrepo.bbclass new file mode 100644 index 00000000..79a19144 --- /dev/null +++ b/meta/classes/debrepo.bbclass @@ -0,0 +1,89 @@ +# This software is a part of Isar. +# Copyright (C) 2026 ilbers GmbH +# +# SPDX-License-Identifier: MIT + +# Prefetch to base-apt repo by default +ISAR_PREFETCH_BASE_APT ??= "1" + +DEBREPO_WORKDIR ??= "${DEBREPO_TARGET_DIR}" + +debrepo_update_apt_source_list() { + [ "${ISAR_PREFETCH_BASE_APT}" != "1" ] && return + + chroot_dir=${1} + apt_list=${2} + + flock -x "${REPO_BASE_DIR}/repo.lock" -c " + sudo -E chroot ${chroot_dir} /usr/bin/apt-get update \ + -o Dir::Etc::SourceList=\"sources.list.d/${apt_list}.list\" \ + -o Dir::Etc::SourceParts=\"-\" \ + -o APT::Get::List-Cleanup=\"0\" + " +} + +debrepo_add_packages() { + [ "${ISAR_PREFETCH_BASE_APT}" != "1" ] && return + [ "${ISAR_USE_CACHED_BASE_REPO}" = "1" ] && return + + args="" + if [ "${1}" = "--srcmode" ]; then + args="${args} --srcmode" + shift + fi + + if [ "${1}" = "--isarapt" ]; then + args="${args} --extrarepo=${REPO_ISAR_DIR}/${DISTRO}" + shift + fi + + workdir="${1}" + args="${args} ${2}" + + if [ -n "${GNUPGHOME}" ]; then + export GNUPGHOME="${GNUPGHOME}" + else + export GNUPGHOME="${WORKDIR}/gpghome" + fi + + ${SCRIPTSDIR}/deb-repo \ + --workdir="${workdir}" \ + ${args} +} + +debrepo_parse_dscfile() { + [ "${ISAR_PREFETCH_BASE_APT}" != "1" ] && return + [ "${ISAR_USE_CACHED_BASE_REPO}" = "1" ] && return + + dscfile="${1}" + args="" + + if [ "${ISAR_CROSS_COMPILE}" = "1" ]; then + build_arch=${HOST_ARCH} + if [ "${PACKAGE_ARCH}" != "${build_arch}" ]; then + args="--crossbuild \ + crossbuild-essential-${PACKAGE_ARCH}:${build_arch} \ + dose-distcheck:${build_arch} \ + libc-dev:${PACKAGE_ARCH} \ + libstdc++-dev:${PACKAGE_ARCH} \ + " + fi + fi + + args="${args} --extrarepo=${WORKDIR}/isar-apt/${DISTRO}-${DISTRO_ARCH}/apt/${DISTRO}" + + if [ -n "${GNUPGHOME}" ]; then + export GNUPGHOME="${GNUPGHOME}" + else + export GNUPGHOME="${WORKDIR}/gpghome" + fi + + if [ -n "${DEB_BUILD_PROFILES}" ]; then + export DEB_BUILD_PROFILES="${DEB_BUILD_PROFILES}" + fi + + ${SCRIPTSDIR}/deb-repo \ + --workdir="${DEBREPO_WORKDIR}" \ + --dscfile="${dscfile}" \ + ${args} +} diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index e69ec3bb..c8503ec6 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -67,6 +67,11 @@ SDKCHROOT_DIR = "${DEPLOY_DIR_SDKCHROOT}/${BPN}-${DISTRO}-${MACHINE}" CACHE = "${TMPDIR}/cache" KERNEL_FILE ?= "${@ 'vmlinux' if d.getVar('DISTRO_ARCH') in ['mipsel', 'riscv64', 'arm64'] else 'vmlinuz'}" +# debrepo config +DEBREPO_DIR = "${TOPDIR}/debrepo" +DEBREPO_HOST_DIR = "${DEBREPO_DIR}/${HOST_DISTRO}-${HOST_ARCH}_${DISTRO}-${DISTRO_ARCH}" +DEBREPO_TARGET_DIR = "${DEBREPO_DIR}/${DISTRO}-${DISTRO_ARCH}" + MACHINEOVERRIDES ?= "${MACHINE}" DISTROOVERRIDES ?= "${DISTRO}" OVERRIDES = "${PACKAGE_ARCH}:${MACHINEOVERRIDES}:${DISTROOVERRIDES}:${BASE_DISTRO_CODENAME}::${BASE_DISTRO}:${ISAR_CHROOT_MODE}:forcevariable"