From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7346118313451192320 X-Received: by 2002:a2e:3c0b:0:b0:2d4:5ce5:2323 with SMTP id j11-20020a2e3c0b000000b002d45ce52323mr499964lja.34.1710401455879; Thu, 14 Mar 2024 00:30:55 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:651c:19ab:b0:2d4:3db9:66b7 with SMTP id bx43-20020a05651c19ab00b002d43db966b7ls339429ljb.1.-pod-prod-04-eu; Thu, 14 Mar 2024 00:30:53 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHPamWv0gYiJPDeGj6WMM8L2z9z7yNSncF+Uiv1+pFUbSo1aiKO7P1hFrjYR36FYYBBQn3m X-Received: by 2002:a2e:a9a6:0:b0:2d3:2a95:6f0b with SMTP id x38-20020a2ea9a6000000b002d32a956f0bmr658943ljq.12.1710401453303; Thu, 14 Mar 2024 00:30:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1710401453; cv=none; d=google.com; s=arc-20160816; b=cSC/gRludF4MTRnjvX0YT7vDgVuld8SDHjk+YpMbS7UhYLzwgi665gQX8wbKqHbltt 184iOpmV3vB79e8fAxtF0p0Tty9q2P/uE2Qgsi9f9T2WMKrgzdxYffrCfGWYdQ9DcVyv aVz2s7Ex05SHvQVd374Hn9wpBkiVuF0juiMTco20XhPp23E6UkbYmwAXTeohpg3AMgeY uZYImllhsTGGjwbKFDCaS4fs18K1FX42oGpPsjVqcMJyLpfcqkjziXaZ1BwI5haemsLJ 0qGMwpNPUmFmGgLIel61KUiNWwewV1i5PGLEzjBpcmRAztjHBjpvEq869/loKmkXBBF2 GcLQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from; bh=+jomylU6eahElKSbHJziRBkdNW0tot2Clr2cQQ/gLzI=; fh=7tclEdh7YbwSQowgJ6LNq720O7H5HTEaqj22NJWRE2E=; b=p8pTY1fg6EGbVCfOBd0BpFLboNyoNRF+n7kIHupHJYJcdleNNExvFrpRjmNc0TyGvN YmXCHnzr7vWWnwzqzduUaBxp/Fk4X0oaiAPKR434hcDp6hesSzi38jvi/03VdMGeLda8 teYi0kSmd8MRq4FPyNvbYXFez2pP39u5agBDrPF0gSaguxGw2D4SZg6W2li37vIEYqKi vaDrdvRUEtrbOcOB8lJ1c7pTgypMLbStxdB9k+PmEb/26/qvHzL4vm7AGZDmxTDdr0ex gdui9KDEB/KqzApay7l3/dz3t50Z+dWYq2Ctbc81efRRa3eV7tM484spLeZnMWlECBHR 6Wsg==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id z20-20020a2e9b94000000b002d46764b564si6140lji.6.2024.03.14.00.30.53 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 14 Mar 2024 00:30:53 -0700 (PDT) Received-SPF: pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Received: from hp15.localdomain (mm-209-185-213-37.mogilev.dynamic.pppoe.byfly.by [37.213.185.209]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 42E7Uo9v021482 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 14 Mar 2024 08:30:52 +0100 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v6 02/11] meta: Add debrepo bbclass handling base-apt prefetching Date: Thu, 14 Mar 2024 10:27:19 +0300 Message-ID: <20240314073047.29465-3-ubely@ilbers.de> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240314073047.29465-1-ubely@ilbers.de> References: <20240314073047.29465-1-ubely@ilbers.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED 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-TUID: TOb4/fnJpKpb This class uses 'scripts/debrepo' python script to prefetch given packages or sources to local base-apt repository. Signed-off-by: Uladzimir Bely --- RECIPE-API-CHANGELOG.md | 9 ++++ meta/classes/debrepo.bbclass | 81 ++++++++++++++++++++++++++++++++++++ meta/conf/bitbake.conf | 5 +++ 3 files changed, 95 insertions(+) create mode 100644 meta/classes/debrepo.bbclass diff --git a/RECIPE-API-CHANGELOG.md b/RECIPE-API-CHANGELOG.md index 2da7968d..cb466eb7 100644 --- a/RECIPE-API-CHANGELOG.md +++ b/RECIPE-API-CHANGELOG.md @@ -572,3 +572,12 @@ the module build recipe. Remove all uses of the function deb_compat. The functionality was replaced with a dependency to the package debhelper-compat. +### "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 +`debrepo` script is used for populating base-apt repo. diff --git a/meta/classes/debrepo.bbclass b/meta/classes/debrepo.bbclass new file mode 100644 index 00000000..6c135ef2 --- /dev/null +++ b/meta/classes/debrepo.bbclass @@ -0,0 +1,81 @@ +# This software is a part of Isar. +# Copyright (C) 2024 ilbers GmbH +# +# SPDX-License-Identifier: MIT + +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}" + fi + + flock -x "${workdir}/repo.lock" -c " + ${SCRIPTSDIR}/debrepo \ + --workdir=\"${workdir}\" \ + ${args} + " +} + +debrepo_handle_controlfile() { + [ "${ISAR_PREFETCH_BASE_APT}" != "1" ] && return + [ "${ISAR_USE_CACHED_BASE_REPO}" = "1" ] && return + + control_file="${1}" + args="" + + build_arch=${DISTRO_ARCH} + if [ "${ISAR_CROSS_COMPILE}" = "1" ]; then + build_arch=${HOST_ARCH} + fi + 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 + + if [ -n "${GNUPGHOME}" ]; then + export GNUPGHOME="${GNUPGHOME}" + fi + + flock -x "${DEBREPO_WORKDIR}/repo.lock" -c " + ${SCRIPTSDIR}/debrepo \ + --workdir=\"${DEBREPO_WORKDIR}\" \ + --controlfile=\"${control_file}\" \ + ${args} + " +} diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 91c5c815..1bff8c8e 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -69,6 +69,11 @@ KERNEL_FILE:mipsel ?= "vmlinux" KERNEL_FILE:riscv64 ?= "vmlinux" KERNEL_FILE:arm64 ?= "vmlinux" +# 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}:forcevariable" -- 2.43.0