From patchwork Fri Oct 2 07:01:09 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: akarpovich X-Patchwork-Id: 5518 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Fri, 02 Oct 2026 09:05:10 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-wm1-f56.google.com (mail-wm1-f56.google.com [209.85.128.56]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 692758KL003918 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 2 Oct 2026 09:05:08 +0200 Received: by mail-wm1-f56.google.com with SMTP id 5b1f17b1804b1-4a0284121c6sf3620845e9.3 for ; Fri, 02 Oct 2026 00:05:08 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1790924702; cv=pass; d=google.com; s=arc-20260327; b=PN9FVd23dYjW0zFTYvvOGzmY8znCCpjB8Nm8iBNKsmliJqhRbMo4BKkpyTZYhYLtuX l2ngH9VsULjs58g77njUNeVOtwwlB0Ca7qBBjs5C22xQnLTO6RfG4lfM1GJGrXNyezDr 3yEQKrLAJTofvKHOMfin2h6Wu+xgi5FLJ4NzUSR7AWuz0Fc45v1aR6nx02L+lG31TICD BHJsKLgHGfVziMRc2IwGMRU7+fe3BeQBdkF8Ir9BPdhvpZrl9sQYB1x0JWOIpWahH7sC z9wd7lKM3sgmljfY/7tr4ZgIEZq6qQJgcREXqiyCVeGOlCTqlOlT7rQOsiwNqtjeIGG9 Bm/A== 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=L5XYnjhRoESvMqpG2C2Wd8lOiikmr509gViOsqMrKXE=; fh=nMol+soWvhxQTpJu8ihYdO+bz/Kk1Rt+f3rc2aJsT5w=; b=gzwNRVAxziMy9ewcHOOZMrMCDODGcTgmZ105kGELU1WG9pb3BZtZCcqQJNmQcAHIvN cyZuqaZxd4n2vwgZdMb4G7h69TV8HUmrS1QLOfnIBnv8Y38zp74FldREsQ490N1Hhuhs PqfXE59tr4xZLXoaixeGLrnbpkUcbKdld9U+dOFznNgLFGzVdeGr9AP8YcCwglxstHcw d+UFvtSLLTsmuGNF7ianCFv2Fg69Pfho6lIIZW5kk5J5eb1Bx/5M4T9s6Or8QOMezU+a TADsvHlB99LlbC7lUcJrr4EQCx55gSEoqtHn9kN94onPb43NTzlIT2j9TF9fipthFY3s bxBA==; 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=1790924702; x=1791529502; 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=L5XYnjhRoESvMqpG2C2Wd8lOiikmr509gViOsqMrKXE=; b=p3D39Lh5Lcoe3ZrFbh1uL8TpiGBmsY5+g0dSEaMBMOm1lM0zfRKOi9XiP4zh7CFiS6 eALubtN1fL7UK2Ut/V/Y7ua4jmZtbehbxSertKj+TCYpspEMtpnVrgq+wqsaaklUGkMu zPXf40cq0UbrKTbahiMuMaWhgX4kOrODeZmWS5s/jdtGshXSG+7V0j4JeJdT2c9/hNgC YxWg3kUoNotCHWOIce2oX5wE+wNfsvWFa0J3V31HcrC4E+uO3f2i45BtL58TT7zUdJpu DvYb3VMtnXhi3+G2/h+S/4IuPdhT5CcD0CD23c0yDP66r0OaDINUPlFpdDz9/I+8o5iZ 3IHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790924702; x=1791529502; 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=L5XYnjhRoESvMqpG2C2Wd8lOiikmr509gViOsqMrKXE=; b=OQAcCH99WEc+Z5mhEfCBNUPYcIHrB6fWDQwAF0QNbAoDohqqwnNgzGztNxK9wY7mop RZu6fNM5cUZTKoUMmqCKaRtcb4ago521rRPOXGWxK0HDgc/FXiymO/NlK0c54GbYM4QU PEDfdQevpHzG9HmEyUNbW74zqQ7hJghOd8Jk4FddNCS1Ijk/gtgGpP8WdNVsyi5dJVrr w5KHKZUaAxMitheMtkITLdeeiiJ9bLIgfzb8mBZv/7IcECgZHHWod+XJAlgnkQ0B9m5H pQv/GiH2pLiQs0kugu6NeYaJeMCVCqpVcSLjOfJBIq1Qu2/V39mdoNwCNg7BtjjN5Y42 Mc9Q== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AKwUvBxkCYhDMJki0R4mJ91SSgESu/s4bFYobAkm5kjN9GHMstAWz6oTAyzDSse5n/xTh3fjbdL2P60=@isar-build.org X-Gm-Message-State: AFuF++mRZC4UB3gc97tToUaXySe4iBSa++VVQB34mZDzRHvtB2fj2otk 01QjVobKRbK2sIkB57yU9VoXkx/OQDk48p//JYvFuaDI4GdAnT8biYhG X-Received: by 2002:a05:600c:3e15:b0:49f:ff32:8044 with SMTP id 5b1f17b1804b1-4a0276a1f1dmr28711835e9.7.1790924701989; Fri, 02 Oct 2026 00:05:01 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com; h="ATskLdfqZdH96c0QJoNvChWeQLxmZ4ouakGmoEfEkyeUNnMhyA==" Received: by 2002:a05:600c:4f44:b0:4a0:14ac:2d52 with SMTP id 5b1f17b1804b1-4a0285d570fls5882575e9.1.-pod-prod-08-eu; Fri, 02 Oct 2026 00:05:00 -0700 (PDT) X-Received: by 2002:a05:600c:3b1d:b0:4a0:2423:946 with SMTP id 5b1f17b1804b1-4a0276b5d6bmr32014805e9.15.1790924699970; Fri, 02 Oct 2026 00:04:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1790924699; cv=none; d=google.com; s=arc-20260327; b=KrE1AemJ1MBR2rtn4wK0rWYTSHAKe53Anl58SAoW+Hg3uGHnnGYree4j5DWnUw/7iP nhZrkF2Ld6WTxqaIWNtke72z1UvVTz5L8iPYkVPV8MmMpSvOmnwrs/fcoH/iOQsWm8Wm iLxcgxnCchp2HU7QlOGQfL6xwpR/KcgpWDZc23XY6T6XaKXGddd+ztQY6XiZx9Zjg1WO buNm9rB9+Ia9hJe7inYmdvT/ZQK89V0YKfvHkZrsj01CwlMO1zfIZAg2IhWZ3S9OtzYE vM3cSEYUZyN7fd4bvD60cHrVp+wNAjiFZr7hEsgkwy164wacj5FLfy0vy196VCpyMZGW aU6w== 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=33o/eN1mkQ939/qbSuPt6BmZTb7KPFmfxlF9Zx3JHAw=; fh=IIbR0JxonYgzdrHDdB9TmZniSh/o1z0HofhfbmLXp8s=; b=EpLutULA3KCyWqBKwxNR7d5nNIv9T5Tf/sk1LehvdJKX7T59cxte9OuoFgMjaueXbX C0lvNkbtGSCGaHe64U4jEi4g1S8prCwnqxfVoj3vEt839bNigq1kz3Cvjwz6d1oojIq/ pr01pYVM3HMIbqcz7vJKk84OxKtaPN3z2iqmBGPdMMtb0B3L/huNyecBYMliTovXkmnZ 8FaMK1Azl2dCzG4Fskave0HNvm1aUmUh3XlMiMAh31VL9O946wzisdGyODFP2FrqmZUa k/vxyifXs4HBQtq8LDD9sR9a4L7RLMg1iRd4wY+mL/vbjV5tpgTPPBvmKBkCu8T4IEf0 12zA==; 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-4a03fef0c14si162245e9.3.2026.10.02.00.04.59 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 02 Oct 2026 00:04:59 -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 laptop-0xxx (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 69274a1l003799 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 2 Oct 2026 09:04:58 +0200 From: akarpovich To: isar-users@googlegroups.com Cc: Uladzimir Bely , Aliaksei Karpovich Subject: [v11 06/12] meta: Add cache-deb-src functionality in base-apt mode Date: Fri, 2 Oct 2026 09:01:09 +0200 Message-ID: <20261002070335.26526-7-akarpovich@ilbers.de> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20261002070335.26526-1-akarpovich@ilbers.de> References: <20261002070335.26526-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 | 41 ++++++++++++++++++++++++++ meta/classes-recipe/rootfs.bbclass | 7 +++++ 2 files changed, 48 insertions(+) diff --git a/meta/classes-recipe/deb-dl-dir.bbclass b/meta/classes-recipe/deb-dl-dir.bbclass index 60e2fecc..7e9f89b1 100644 --- a/meta/classes-recipe/deb-dl-dir.bbclass +++ b/meta/classes-recipe/deb-dl-dir.bbclass @@ -27,6 +27,47 @@ debsrc_source_version_filter() { | sort -u } +debsrc_fill_base_apt() { + export rootfs="$1" + export rootfs_distro="$2" + mkdir -p "${DEBSRCDIR}"/"${rootfs_distro}" + + ( 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 + rootfs_cmd \ + --bind "${DEBSRCDIR}" "/deb-src" \ + --bind "${rootfs}" "${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_download() { export rootfs="$1" export rootfs_distro="$2" diff --git a/meta/classes-recipe/rootfs.bbclass b/meta/classes-recipe/rootfs.bbclass index 61d2bdcb..ba56678a 100644 --- a/meta/classes-recipe/rootfs.bbclass +++ b/meta/classes-recipe/rootfs.bbclass @@ -515,6 +515,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_priv + debrepo_update_apt_source_list "${ROOTFSDIR}" "base-apt" + rootfs_do_umounts_priv + debsrc_download ${ROOTFSDIR} ${ROOTFS_BASE_DISTRO}-${BASE_DISTRO_CODENAME} run_privileged rm -f "${ROOTFSDIR}"/etc/resolv.conf