From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7237382541983875072 X-Received: by 2002:ac8:7d81:0:b0:3f4:8605:d8f0 with SMTP id c1-20020ac87d81000000b003f48605d8f0mr238003qtd.11.1685084436428; Fri, 26 May 2023 00:00:36 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ac8:74d5:0:b0:3f6:c08f:35fe with SMTP id j21-20020ac874d5000000b003f6c08f35fels514762qtr.1.-pod-prod-09-us; Fri, 26 May 2023 00:00:35 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7L0EQZbTByi0LK50CvJiYmRRNqP6iSNniS96nQD2+Hb+WTnAMBa7inxE/TRK0tlYLf4+0j X-Received: by 2002:a05:620a:40d2:b0:75b:23a1:3638 with SMTP id g18-20020a05620a40d200b0075b23a13638mr1219122qko.73.1685084435716; Fri, 26 May 2023 00:00:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685084435; cv=none; d=google.com; s=arc-20160816; b=pAgtXlSw1gcLtI3cWrThp60bvy7tDGMtVOySzUPlsgHHS6L5DsUYhvaBZVfmyb8bTq lNTpE8OwGcxVS8WnNIh64hexVK1mDIza3TsLnAuamlD0QTbUoVCqyISp7ilghn4O/ZBN cOp5O4Or3CntpYfH/wxsC5z0xR2PBmsRAKOqLAQXvfYsVqtMusCRPmYTncoYKUCe9hIL 8TlF6dlNuNgCgBifr3JEXmGzL/yp+Qr6Bptd/56jvMazzcGi9/tMrlQcHPrOIP3Zw8ko C0UUeQHAhbADQH/pvpvygNnTVCSXUpJRe+wUSe4bWi4l4/Hj6lMu57tZkf1FB/L8QfXG C0HA== 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=j+iOBgE8VBlctDpx5IPnXi+dmgv0xdr2xghgFqSNDFU=; b=q4gmoWNtrQw/Xf8to5KJrqn4yjzr/UMpTIpzplpDQbLmOlZH0XEx5tROLzOnERoinI iAZI7caYHBZMD6IWoj/gBFk7yMUDDvXvzWMEGDL9gao3YIgO1bQtB1UQFLNQHRvJ9GjV Z/93Y1bYwAv8DOLphAz0Ck1PoRGqB1W7q9/fTTotA3zM+yKR36J1ZqCRB74Rj5vA5QNR MJHrLmYPs+bOCvPgENoHMDce3VfCwHz6NTPAcvJ7T7Q8EZ8PGGCWwipU14Lex7FXTec4 nUM5ifUtsOqbj+RfRnASqRDeTj2sb+KLuzDrJgyQu9CfSdYQlqqBmQQTBYe8+GiTSEup gFsw== 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 a21-20020a05620a439500b0075b38daac2asi262608qkp.6.2023.05.26.00.00.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 26 May 2023 00:00:35 -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 baighyz.m.ilbers.de (host-80-81-17-52.static.customer.m-online.net [80.81.17.52]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 34Q70R3Y013306 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 26 May 2023 09:00:29 +0200 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v5 04/12] meta: Add debrepo bbclass handling base-apt prefetching Date: Fri, 26 May 2023 09:00:19 +0200 Message-Id: <20230526070027.16890-5-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20230526070027.16890-1-ubely@ilbers.de> References: <20230526070027.16890-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: rkLf5w7utyK+ This class uses 'scripts/debrepo' python script to prefetch given packages or sources to local base-apt repository. Signed-off-by: Uladzimir Bely --- meta/classes/debrepo.bbclass | 86 ++++++++++++++++++++++++++++++++++++ meta/conf/bitbake.conf | 5 +++ 2 files changed, 91 insertions(+) create mode 100644 meta/classes/debrepo.bbclass diff --git a/meta/classes/debrepo.bbclass b/meta/classes/debrepo.bbclass new file mode 100644 index 00000000..8f2a3215 --- /dev/null +++ b/meta/classes/debrepo.bbclass @@ -0,0 +1,86 @@ +DEBREPO_WORKDIR ?= "${DEBREPO_TARGET_DIR}" + +debrepo_update_apt_source_list() { + if [ "${ISAR_PREFETCH_BASE_APT}" != "1" ]; then + return + fi + + 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() { + if [ "${ISAR_PREFETCH_BASE_APT}" != "1" ]; then + return + fi + + if [ "${ISAR_USE_CACHED_BASE_REPO}" = "1" ]; then + return + fi + + args="" + if [ "${1}" = "--srcmode" ]; then + args="${args} --srcmode" + shift + fi + + workdir="${1}" + pkgs="${2}" + + if [ -n "${GNUPGHOME}" ]; then + export GNUPGHOME="${GNUPGHOME}" + fi + + flock -x "${workdir}/repo.lock" -c " + ${SCRIPTSDIR}/debrepo \ + ${args} \ + --workdir=\"${workdir}\" \ + ${pkgs} + " +} + +debrepo_handle_controlfile() { + if [ "${ISAR_PREFETCH_BASE_APT}" != "1" ]; then + return + fi + + if [ "${ISAR_USE_CACHED_BASE_REPO}" = "1" ]; then + return + fi + + control_file="${1}" + + args="" + pkgs="" + + build_arch=${DISTRO_ARCH} + if [ "${ISAR_CROSS_COMPILE}" = "1" ]; then + build_arch=${HOST_ARCH} + fi + if [ "${PACKAGE_ARCH}" != "${build_arch}" ]; then + args="--crossbuild" + pkgs="${pkgs} crossbuild-essential-${PACKAGE_ARCH}:${build_arch}" + pkgs="${pkgs} dose-distcheck:${build_arch}" + pkgs="${pkgs} libc-dev:${PACKAGE_ARCH}" + pkgs="${pkgs} 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} \ + ${pkgs} + " +} diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 89b3e6a3..91f81bd4 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -71,6 +71,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}" + OVERRIDES = "${PACKAGE_ARCH}:${MACHINE}:${DISTRO}:${BASE_DISTRO_CODENAME}:forcevariable" FILESOVERRIDES = "${PACKAGE_ARCH}:${MACHINE}" -- 2.20.1