From patchwork Thu Jul 25 15:07:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Uladzimir Bely X-Patchwork-Id: 3729 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Thu, 25 Jul 2024 17:10:28 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-lf1-f55.google.com (mail-lf1-f55.google.com [209.85.167.55]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 46PFARsu007239 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 25 Jul 2024 17:10:28 +0200 Received: by mail-lf1-f55.google.com with SMTP id 2adb3069b0e04-52eff760f37sf364452e87.0 for ; Thu, 25 Jul 2024 08:10:28 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1721920219; cv=pass; d=google.com; s=arc-20160816; b=Y/gVyR1y3gDWHw6YCsM4NWS54ZY/6LPN4pOcu/30NSUaxnwrfRN3i1iaw2Ji8XAlVk UszsYr4IciCkLDbbWaGJ8cD4LkNWJQrPQRT3Ljq1rbnN0ydtiQqxFa/otglP53JdM0IS ujAs9rUEQ8n1Li82H/uBg1mV6sAJT/RlUbPetr3jWid6LZlYZ5uO1BWDF6cw1wHHGnho eLtkfTahPS2T06S607liFvufxGBZU/rOy+Twh/qrFgO1kBUb0uXaOHd9BHA1D4LWdnfs 2DwrcSYdUsUMmiRdw1W0drFRJ08iphZtK1bSGrRW+zi57op+e+VdStm6T5jAnKIxW9YR PUyg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; 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:to:from:sender:dkim-signature; bh=i60pxfaTbDxglRcJT9kulFvAOACLDGR1MPKp6d7JYcs=; fh=iRe0JhK6cRUcg5K/GSIsmsKKFsvRRa3787JT4zoIsEM=; b=wu+XspZrdvaIMDT49z5LrNHDv1WwafA3gcQkzlGsbIVMBNfZinFfAtkbK6/2uRAMht xRfUifG3bTi/qcnABuMg7Uqu2mfNflpeePy9JQpO5IsUeE+URmN3RdnmCjn71NDmZuBk GZAEOzwFM5X4KJCKeDiEB5DTPj7BdKJT4yA0vlAPw5dgTfhpAKybuE/rD6O2n7HoKoxP ReJ4B2JpuUav7zz27x79zLWbmuPuQ4ZRMeNrAM1fV1Qvf4WMOrIz+h/b2gzRPrqZTKdw qqnuy6LBSKd3SJ29hLWMbQbbejLqPsW4+nr/GPM/xRYZ8J4kjMnbWkOqAcfbdAgaZJD8 McYw==; darn=isar-build.org ARC-Authentication-Results: i=2; 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1721920219; x=1722525019; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:to:from:sender:from:to:cc:subject:date:message-id :reply-to; bh=i60pxfaTbDxglRcJT9kulFvAOACLDGR1MPKp6d7JYcs=; b=NqTD66vn6lFFfIEz+B204cECf2p4QJ/HnNlakktXpjvLhuMWHKPTclV+VcdgE8eFSh BTKdQxJSk+9ujq5u9RIDu9jgprMxb5N557eQOHM2eWmP5FJ8lEFBg2belL+J/tBT+VkF jBB1obRXbD78EY+7Q9OupoO4Tm9NZoTAJ6wx/utwWTZc9Ep8EmAQ2ipqiJ58T+A2r4c7 7X4Uktg9y/rrDgociCAxUVDNRG1FyIfUk99Ml9yCMlQiCScA53nikir1u0WG5Ho/HZFp YMAVR9wC4hFKhdTDPl/oTDOg7o+hc/bjNtFVFxJr+wMubaY9/IYVUxC/KM5U5sQ3++BE Ky5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721920219; x=1722525019; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:to:from:x-beenthere :x-gm-message-state:sender:from:to:cc:subject:date:message-id :reply-to; bh=i60pxfaTbDxglRcJT9kulFvAOACLDGR1MPKp6d7JYcs=; b=b/RJ+KSAR0ey90MqhlXmrVUGqTq9nYkVCYxujXmXeYAuFNfO5TKwZrXMRu2JlM47Rr tFzsUJE1v9JysLTsb9zbq8+GwY40Xp+UBW7AuL97ONf90jTQ4svfGrXVo8Qth4aGD7Qd z6MzTgZeZ4tj5VDdRrT4sZud/XyJU6fTo2s1bnmwo2I044yYqhqrNfAcSU2WUE0lBgbk uqLfRjtYqlL1ZlkK5ZSxaE1JPf3GpO7hB3n9DgoqnDXVG7tJGKsAvpifSsjzNNaVvzQL a2S24Rv1m+qaeYI5fpVFh+INA7Px0zUIA+72svstvnQZY+YFtFPSH+egrKAupyieGq2O IxsQ== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCWpowUDlhHMkezY9WgN0yX1dfozYIDS/CpTz2qaFMFM63fu2HPR/V5S8lg/JjwdjKgjqC5j8Wp8IvCY7sYRvQGFO81VagM= X-Gm-Message-State: AOJu0YwvS+rm+A9pQVsCF+5k3i6j861ldySi9ADKD+hFST2Q1TUJcreL muqiF07DcDdyASlbvTQ4IvDTJhwl4jqGyaKM+sorP6uOklSiXqmc X-Google-Smtp-Source: AGHT+IGyj8FwbD/OzMJvmMijCCuVetOEGbKi0XlbvhWvYIRCGXF0M4M+PU/BRfkTXOxDGdfM2UbkiA== X-Received: by 2002:a2e:8693:0:b0:2ef:392e:e4f with SMTP id 38308e7fff4ca-2f039dc898cmr20298741fa.47.1721920218293; Thu, 25 Jul 2024 08:10:18 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:651c:2110:b0:2ef:1eb3:473b with SMTP id 38308e7fff4ca-2f03a2b4be5ls5890011fa.0.-pod-prod-02-eu; Thu, 25 Jul 2024 08:10:16 -0700 (PDT) X-Received: by 2002:a05:651c:305:b0:2ef:2c2d:a603 with SMTP id 38308e7fff4ca-2f039ce1930mr22036231fa.21.1721920215970; Thu, 25 Jul 2024 08:10:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1721920215; cv=none; d=google.com; s=arc-20160816; b=Ji5HMXt1OBjSARb1+mLxWycjPC9h3Mwgjqzgdz5yECiaoCJq7ZdFRt4hQzAH4Ct8yP 0rqA3EeVdGgsiqLQufiZn2cHkMOD7MxjmX5dQNC9GkargOdNhENchT6F7ZT4wja3u6/m zfXdhj1P30qs8tGmzarEQkvHp46CAQUUT6LoqSuTJRA/o4upT8SbwJzTnaxP2zRhJwrY wqlhiKcAfy3LJ6+9a3IRQTjQPMuEK4j8ZKzq4uMPZXPLgvz6DH26LtVNbNgsnQtKBRMh 1kekhhVboWpIoF0/szJltWSsiSRet3Z3+mstqbFgwiWJ0W2z5Ictox4MY2H6PO5YMZW0 WUWw== 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=oba5bPyQhf1AKGklDMzdOw+hiuOFo3LfNSG/bOxIBrg=; fh=7tclEdh7YbwSQowgJ6LNq720O7H5HTEaqj22NJWRE2E=; b=WkwFzs9wBNg7k9DNvOaSu11DCTyI6xRjKicWEN2ZkCH7pmZm2+zEBu7NuvdEKtC+8u Tay6yh1/Nti8WBWbxKtJmvjgaSCb8ybLiJUsx3wS0jMPpX87JcpNajxN8jULXffB1UpB mtrsAeBfH94mTuq5lsKBifGpSd2vrbef/2puPZGLKQW0Us37IM1L8t2e67UOTYaClWZR E1bhrVkfFiK/p4VyKWx2xD3ur6VCDyXGPdjx0h1SgnkMcWHSw093vjQ4RA1xzIQNNLdW wTg8cNm4CpC4mDETx21fL0V4/8htDzx8LP/XVWumnhvLkg0+9Wc00NAgnJH8q8+JWZRY 72ZQ==; 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 Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id 38308e7fff4ca-2f03d02987dsi376891fa.6.2024.07.25.08.10.15 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 25 Jul 2024 08:10:15 -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; Received: from localhost.localdomain (44-208-124-178-static.mgts.by [178.124.208.44] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 46PFACKc007063 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 25 Jul 2024 17:10:15 +0200 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v7 06/10] meta: Add cache-deb-src functionality in base-apt mode Date: Thu, 25 Jul 2024 18:07:38 +0300 Message-ID: <20240725151006.2129-7-ubely@ilbers.de> X-Mailer: git-send-email 2.44.2 In-Reply-To: <20240725151006.2129-1-ubely@ilbers.de> References: <20240725151006.2129-1-ubely@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_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: ubely@ilbers.de X-Original-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 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?= Fill base-apt repo with source packages. Signed-off-by: Uladzimir Bely --- meta/classes/deb-dl-dir.bbclass | 19 +++++++++++++++++++ meta/classes/rootfs.bbclass | 3 +++ 2 files changed, 22 insertions(+) diff --git a/meta/classes/deb-dl-dir.bbclass b/meta/classes/deb-dl-dir.bbclass index 55e56c50..48233a62 100644 --- a/meta/classes/deb-dl-dir.bbclass +++ b/meta/classes/deb-dl-dir.bbclass @@ -41,6 +41,25 @@ debsrc_undo_mounts() { EOSUDO } +debsrc_fill_base_apt() { + export rootfs="$1" + + local srcpkgs="" + for package in $(find "${REPO_BASE_DIR}" -maxdepth 6 -type f -iname '*\.deb'); do + is_not_part_of_current_build "${package}" && continue + local src="$( dpkg-deb --show --showformat '${source:Package}' "${package}" )" + local version="$( dpkg-deb --show --showformat '${source:Version}' "${package}" )" + local dscname="$(echo ${src}_${version} | sed -e 's/_[0-9]\+:/_/')" + local dscfile=$(find "${DEBSRCDIR}"/"${rootfs_distro}" -name "${dscname}.dsc") + [ -n "$dscfile" ] && continue + + if [ `echo ${srcpkgs} | grep -c "${src}=${version}"` -le 0 ]; then + srcpkgs="${srcpkgs} ${src}=${version}" + fi + done + debrepo_add_packages --srcmode "${DEBREPO_TARGET_DIR}" "${srcpkgs}" +} + debsrc_download() { export rootfs="$1" export rootfs_distro="$2" diff --git a/meta/classes/rootfs.bbclass b/meta/classes/rootfs.bbclass index f41fb498..f9c37576 100644 --- a/meta/classes/rootfs.bbclass +++ b/meta/classes/rootfs.bbclass @@ -235,6 +235,9 @@ cache_deb_src() { sudo cp -Trpn --reflink=auto "${BOOTSTRAP_SRC}/var/lib/apt/lists/" "${ROOTFSDIR}/var/lib/apt/lists/" deb_dl_dir_import ${ROOTFSDIR} ${ROOTFS_BASE_DISTRO}-${BASE_DISTRO_CODENAME} + + debsrc_fill_base_apt ${ROOTFSDIR} + debrepo_update_apt_source_list "${ROOTFSDIR}" "base-apt" debsrc_download ${ROOTFSDIR} ${ROOTFS_BASE_DISTRO}-${BASE_DISTRO_CODENAME} sudo rm -f "${ROOTFSDIR}"/etc/resolv.conf