From mboxrd@z Thu Jan 1 00:00:00 1970 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-f57.google.com (mail-wm1-f57.google.com [209.85.128.57]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 6847tvKX004172 (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-f57.google.com with SMTP id 5b1f17b1804b1-49b7c1dc61esf6490135e9.3 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=dv6rc6HtbascoBGbtyFjDh/Uo/umNvhZdd7x65qWzCuin+5mHnMuO5mBce/uqsqjef PurVzfGnMKt5IZO9r+5FaOIYA8gcTW8DcIt9i4J7sZSIHgYuwKAMxNpE0AzjxEyz8/WJ 8QNMAysgdRTuzbntEVBvWE7IFmunsZT4kv0ncGHhSN8U4UfLboCqjzVtDIerdl9epaLf asuVJ4nV/jfeLO5TywoqEYCLLqJAfZ9VRYu/u8tk4RuPjlGUk+ZSnQRb18u7mgHK4nns DRVaB8fVJkkIe7zxRCZKIAI4BxazBnhAf8ZR5ECm5GvFTnDnIZmHxA9adFaGVsd8BxDm GjlA== 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=tDgwSoFRQWkli8ov4acJO3ZdFYpG4THCj+wapJJctrE=; b=maDqh5emxlndsA9na7o0nOPHJg8TNZHTNIGsgwPk5Rrzmqt/DLgqGyUqrV15vOrtph yqjtguNsIX8vfBsd7G/AP3F4y3x8lCQeNuZPA4pkM9qf60MhuE4vpVb3G3r44qElNCZI 4tKcwKmVLD8JC0c5xbzMFRvBE8V+69uuV7ve36tg6fKRxNLIyqiG/Dp7ND7ry8jMkziP X2EoClMweRPc5AbXnlxN0iPpNEN4qRralG0rDZ59xTtFkKApALbYGknd8sxIlZiSU7NB ca/XemBqycdRWzormfj/n6cnQW1lHj4v2DHOez5g7Ggp0eCT+x6t0Gohe9K4jdaT3/44 bZ2g==; darn=ilbers.de 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=ilbers.de; 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=dEVrRkwy70LZDrGajyn28OmFkk2vILVfpapnheZ/xXuIf/7XAxtK+58Xr04MSs0SpM xKmK7wjYULUVDCwyeVJ73QHqfmcjv/TvHM8NnKTPC2Wy39SQwqAuh149pow9n6++nKTJ 7QX1h8hwbwUxaU/YhMQawv0FXYtZi53fFmTR97PnQ+sTMZRXuKiLJ4ytVHrREWQFKN8k WbWoQ2zmKbpBFCtpBavjwcsHaKWfunK53h2iRtIUenLVic5u62Qy8rEDmul6wJryJTcj GkmjG3atP4WuJrdNYcEhTd0KlygZ+ftY1J5vuZ0xi5qzQjZ7TyBJhFYZJBAfuy1NIqSf evQg== 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=LqC8HdiJ5YaUYNXbfXdkM6LOeMo1RYUiNDgfQZq+AkDc91xl5jE0HRy4GgpaAX+Fz5 CqZEOFx//jyVRMF6DSiGYmSdni+uPAH4Z+9FW/f/ap+MJxT3nPVVh9haho0gIuBXBBld UTWRffBy7jtZrUH4Ngg/7p8XgbDP76WmfJ2+mCvjw95NQ7OJluMj65WYiU7b+sSVqkUG 0jC9q4ly5n5CsfgsT2AA2gMJFtfGB1cjDuxJbvMBayIZTkJbg8r1Q0Cpa7ndZuqmiUWn 4vb7Zxe5W/ZQpX+Hh7Xq7UrI5qkiVdq4iD5Kpvf0BjWNm4ynOtTZ73SPzqstUsp9k316 SpVQ== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AKwUvByDzRv+i3l9LgkyD/2uHQMZvFnVwrWQNL7YNDN1e5s92eZHLYuVHsJeXKzo4GUbjbWWfxTd@ilbers.de X-Gm-Message-State: AFuF++lNyQ6VbtTCKGZ/8XLXJgTo3/9tSkNeF7+jZ1pnmmo88tCQuA4e Mkt6qEPlTSY9yCsF9O0F/5d1OPAvmiHRz6LFjQG+xpIrbcf5NAlj20rU 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 Content-Type: text/plain; charset="UTF-8" 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-TUID: clCNO8g6ssQh 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" -- 2.43.0 -- You received this message because you are subscribed to the Google Groups "isar-users" group. To unsubscribe from this group and stop receiving emails from it, send an email to isar-users+unsubscribe@googlegroups.com. To view this discussion visit https://groups.google.com/d/msgid/isar-users/20260904075515.25962-3-akarpovich%40ilbers.de.