From patchwork Mon Jul 27 11:26:24 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aliaksei Karpovich X-Patchwork-Id: 5291 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:15 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-lf1-f60.google.com (mail-lf1-f60.google.com [209.85.167.60]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 66RBTEna001056 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 27 Jul 2026 13:29:14 +0200 Received: by mail-lf1-f60.google.com with SMTP id 2adb3069b0e04-5aeb49bb645sf1541536e87.0 for ; Mon, 27 Jul 2026 04:29:14 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1785151747; cv=pass; d=google.com; s=arc-20260327; b=aSpEuzLNFRu6lCKO8StN4B8otLIUhMWur2TA/HBzCUVkpz8N4tqCldfRHX3NqEE+ct ebwUqaZotuakoi7mrgbDj9Nff3B7M7AYoMPn0H3ssfKgPLpO3Th/MsUfcqFCqSV5CxJ+ 683Og+tilabBXMCGtKngQVkC5TTWHg07JGA92xDdFyRckuAoDV+nAL2VIJOvfCiFHH4E ZkghhDUyJuLGqBsTVi91TJMSr2ktzD7e5qo1XRKparGRUDb2/Rx+uiDeoH3UJfN6uJdM 90Xd+Hrf1ELRNGxvIJC7qQR5xgfoXn/5FN0sdPmbmoUpOAR043lB9ymICan3GiLUNqjg cG5w== 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=nLO6Ui0KGX3j8wKqBkeJet2nLofcxlz4JVSYXNQQqLY=; fh=J55Zx7ezFcPgY6zRAb0XEu7QOD9QiVCs7DkcIr0Bsik=; b=ApXeWO1/gFyOioC1WuyilHGKPRd4Gjwy01Q07bjefxY6G45yurPYYIA/oxeo/8nNA3 eyCxg4KTzA/t7QgVfI//sV11IwZPPbUaBioKg5JLoBw7gT9RkPSv5ETC467zJen9pXCQ XmPYE30gyCkM39MBVRDKNomS8JFOGwt2DVgxPzgpk6+H/2VHeRtoQWKIkQYj/xT4xuOu i1OOAoqL1JjKH5iggXqjVv2AY4QMrcuJ1DEaSIFsj2fOXeMMAtFopWvbD8/U4WfF93E6 GF09wd6/7IDu2t60Imswksc/cRNPwmZUvwgSoFF9na7HNQKE7Dc667jmPjSIGDul7q7x P6zg==; 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=1785151747; x=1785756547; 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=nLO6Ui0KGX3j8wKqBkeJet2nLofcxlz4JVSYXNQQqLY=; b=L3OiJSe0iD6ON7ppRoTVl4ZERsbUkKCKV3RdQhuFQs5NyPZz0z5pvglSHVoNVT6Saw 2HGXURC7RQeLWi6vTkka9GUCfa2bIb8qrhvMsldWuMldRbdvidhUUDfiTx2UKyFqMwWL GRnc+iH9aYjWsIYE/JF9slJcQmC6zxB1ZA09X8L3J6DoxJlT45KPMmnbnYwS3URw3Ymo EKh/2Ppke6HU60R6fcvV16i4VJgEEvrCvuGNOd95Wj4S55dvApYH5JOYRCHwLFyuotiT pyFDQV7aGooJhlAGJLZF5iFskIAPp19Puq/6eiVtUGCTkfU8MS0KcWApxn+q/SR+DjOU 3J4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785151747; x=1785756547; 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=nLO6Ui0KGX3j8wKqBkeJet2nLofcxlz4JVSYXNQQqLY=; b=pmIr/ZPXVFgcyshHKPtXAFYaDSx0crUJI8Dh819elhAhhQ01BVfAarN8A0nR/3NYTK JwsE9SxRXf+D0DvFlNuI4Ybg3PSJUYWYt181ryTe6K49Re7cdUt2fQMGyRQZ5sbEcG8c p/i9O7i63Mq2c2jCKYvcy7JimBUhG45/UGvC8B/QkBAv6t/l9tv+8csbj0H3oDBRfHPb LF0rOKn9A4caKA8ti9Gvmhog389HyTeEqX87iAo+2SjaATc1sC55XFR2Ze373SGIJQpv PTeKlFAbuPjy7fUBbCcuVHjViys7tkY7+ZgiMuL6ekINP8sQgWQiy5RPtrr5+cfeb/Rk 3iow== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AHgh+RrbJQPEh72fNTGJ4Poon3lo77AFVarRQkksne68r3Mt6vekGNzV58OALAay+13I+dSjbe0Y0o0=@isar-build.org X-Gm-Message-State: AOJu0Yz0cQ62DCvf5HBUWi+u5OGuzk9aj2w5U/DbI7c3RBh1V0esN2RQ 7WZEgo40DfRLmFOaFLNzriSzMpEQrRPaGOPKiQn6yraBfV8UOVF2uSpG X-Received: by 2002:a05:6512:10cd:b0:5ae:be77:44bc with SMTP id 2adb3069b0e04-5b2c1affaf6mr1557230e87.4.1785151746891; Mon, 27 Jul 2026 04:29:06 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com; h="Aa7YSPSjahyfOW0LmxZ8MYiIV7wGYrMmJPvDnlSRzSFzfYODKA==" Received: by 2002:a05:651c:31cb:b0:39d:bbe9:baf1 with SMTP id 38308e7fff4ca-39f2ca95f84ls6182451fa.0.-pod-prod-08-eu; Mon, 27 Jul 2026 04:29:04 -0700 (PDT) X-Received: by 2002:a05:651c:1145:b0:396:a1ec:7f5c with SMTP id 38308e7fff4ca-39f2887ec7fmr15294011fa.25.1785151744503; Mon, 27 Jul 2026 04:29:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1785151744; cv=none; d=google.com; s=arc-20260327; b=NI4zSKVRvdNeK82+gqt792l/GByRdxra1sLzQg/oO0wnZv3cZaKXg8FJoeSVggenwn D340sotPF0wdOitnGlmUq+3dFzHo074yHzyBE0/lyKjuF6SrSoi/pKjvD6WEXI5eJwL5 Gf5TNBGMOTXPTlZau3bMuPC11NehFBb8OUYlcV576KnUq7PUDr5/bkrVS0pB0DxrOM17 K1Hz1RyIoM2gHEsLdfuYGoBpLHoqiGiZNTRkYa41bKb9/wuAESzsTIb/GgTHJp4TwQhT T3oehtuAcH1pNWRjd/tQWrHAcJFjUzXs8T1so++irmyez2UJJH34qfpQsZlpILejIA6i GQLQ== 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=/H36PZUjJ7gy9X1b0bftlpttRSUWuos/aGaNtKalxbo=; fh=IIbR0JxonYgzdrHDdB9TmZniSh/o1z0HofhfbmLXp8s=; b=d+uOxWhsS9s2c/xJkJhg5yjXcb4bJAhzKo1ly0FlcPH4sh9tR8A3pt3hhCSA+MmNn0 SMPOcRy+4baoSvRoq8UsQlHXjXSCjWVHS0JyDy+Pke9u37obTu0qqI8AOA0ejcKbHHbu j5ajCGtfUXOTUlfTR9rchxX1BmRMKtn66qzBYfwH0ZQJuJM6eyIhd64Q54wvphx6xLI0 CC9BhA8MivasDxIvEmcLWdCOaP9GOW6dDSu1+YADmMxNc0gJj4eNO8GW4KgYaoqZRMO+ bbIej2QK8ZQlvjDlh3K83p9QYPFrwQmOiiiC6rOsWE0vCUxd7SDClYSxd+b5eaBtry0V Jd0w==; 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 38308e7fff4ca-39f22255cf0si1718261fa.5.2026.07.27.04.29.04 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 27 Jul 2026 04:29:04 -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 66RBSjdW000930 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 27 Jul 2026 13:29:03 +0200 From: Aliaksei Karpovich To: isar-users@googlegroups.com Cc: Uladzimir Bely , Aliaksei Karpovich Subject: [v8 06/14] meta: Add cache-deb-src functionality in base-apt mode Date: Mon, 27 Jul 2026 13:26:24 +0200 Message-ID: <20260727112812.2255297-7-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 Fill base-apt repo with source packages. Signed-off-by: Uladzimir Bely Signed-off-by: Aliaksei Karpovich --- meta/classes-recipe/deb-dl-dir.bbclass | 45 ++++++++++++++++++++++++++ meta/classes-recipe/rootfs.bbclass | 7 ++++ 2 files changed, 52 insertions(+) diff --git a/meta/classes-recipe/deb-dl-dir.bbclass b/meta/classes-recipe/deb-dl-dir.bbclass index 60e2fecc..39c77151 100644 --- a/meta/classes-recipe/deb-dl-dir.bbclass +++ b/meta/classes-recipe/deb-dl-dir.bbclass @@ -27,6 +27,51 @@ debsrc_source_version_filter() { | sort -u } +debsrc_fill_base_apt() { + export rootfs="$1" + export rootfs_distro="$2" + mkdir -p "${DEBSRCDIR}"/"${rootfs_distro}" + + debsrc_do_mounts "${rootfs}" + + trap 'exit 1' INT HUP QUIT TERM ALRM USR1 + trap 'debsrc_undo_mounts "${rootfs}"' EXIT + + ( flock 9 + set -e + printenv | grep -q BB_VERBOSE_LOGS && set -x + + # We need temporary files for our lists of source packages + # trap exit of this sub-shell to remove them (this script may exit abruptly + # since "set -e" is used) + avail=$(mktemp) + wanted=$(mktemp) + trap "rm -f ${avail} ${wanted}" EXIT + + # List all packages known to apt + run_privileged chroot --userspec=$( id -u ):$( id -g ) ${rootfs} \ + apt-cache dumpavail \ + | debsrc_source_version_filter > ${avail} + + # Use apt-ftparchive to scan all .deb files found in the download directory + # and get the pairs that we wish to download + apt-ftparchive --md5=no --sha1=no --sha256=no --sha512=no \ + -a "${DISTRO_ARCH}" packages \ + "${REPO_BASE_DIR}" \ + | debsrc_source_version_filter > ${wanted} + + # We now have two sorted lists: source packages we want and those known to + # apt. We will only consider source packages that may be found in both. + comm -12 ${wanted} ${avail} \ + | while read src version; do + debrepo_add_packages --srcmode "${DEBREPO_TARGET_DIR}" "${src}=${version}" + done + + ) 9>"${DEBSRCDIR}/${rootfs_distro}.lock" + + debsrc_undo_mounts "${rootfs}" +} + debsrc_download() { export rootfs="$1" export rootfs_distro="$2" diff --git a/meta/classes-recipe/rootfs.bbclass b/meta/classes-recipe/rootfs.bbclass index 3ca46bb6..5a66b4ca 100644 --- a/meta/classes-recipe/rootfs.bbclass +++ b/meta/classes-recipe/rootfs.bbclass @@ -495,6 +495,13 @@ do_cache_deb_src() { run_privileged tar -xf "${BOOTSTRAP_SRC}" ./var/lib/apt/lists --one-top-level="${ROOTFSDIR}" deb_dl_dir_import ${ROOTFSDIR} ${ROOTFS_BASE_DISTRO}-${BASE_DISTRO_CODENAME} + + debsrc_fill_base_apt ${ROOTFSDIR} ${ROOTFS_BASE_DISTRO}-${BASE_DISTRO_CODENAME} + + rootfs_do_mounts + debrepo_update_apt_source_list "${ROOTFSDIR}" "base-apt" + rootfs_do_umounts + debsrc_download ${ROOTFSDIR} ${ROOTFS_BASE_DISTRO}-${BASE_DISTRO_CODENAME} run_privileged rm -f "${ROOTFSDIR}"/etc/resolv.conf