From patchwork Thu Mar 14 07:27:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Uladzimir Bely X-Patchwork-Id: 3410 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Thu, 14 Mar 2024 08:32:00 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-lf1-f63.google.com (mail-lf1-f63.google.com [209.85.167.63]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 42E7V6uu021612 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 14 Mar 2024 08:31:06 +0100 Received: by mail-lf1-f63.google.com with SMTP id 2adb3069b0e04-513b8b37446sf831767e87.2 for ; Thu, 14 Mar 2024 00:31:06 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1710401458; cv=pass; d=google.com; s=arc-20160816; b=QAjFTcHzCa6bPVVbbe2eU3H0aVYkNxVW0ty+wwOv///pS3TdomNqSSgZTHwRdDwRfg dPLfaTXwmdMNOpzlQ4Eb06WAcQhJ8u+6T6lWS+TDSzc8RVqinWv/OQvmfI7v1DRKVXji xVwF+8N/tMWvGvzS7B71OkuMUN7lGC1IIM43Fw7213kkjcwU0y6GPsjRCsEM8BKptHPu f1yDd0XzWEsO4KFMiXDgtX/3pI1Ms/lqBMh4tRrYNLT3oacWfx8zFQuiu5XKm6a/nN/D FBeREu9jK0jD74XF2rPyitDHluqWKlwk8ebNtyMWLDf5kBETcc233lKw78+6Plsd0xjS b6PQ== 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=iSUhful2V++t4xBXKZCe//tdC/z+0DWNGaytUgXZbEw=; fh=oZfzfZAOOK+A+FKt0KZb3TKc8AByK1H8ZXl5UhfzM7w=; b=Ogp+ak/0rLHA4EiefX0bPk5/z2F2hB54Mg3bULoq5F7mfUFCrLp/XbzVJvO7Q1reU+ D1s+6kydd0kW6F/uDkFLaOoxTkc/k4VPh8Pubw5oIGKgJsTY+9LI83M/UNDW8TYYMRZm zLOVqJDTFvMV7GvQDQ4MC06jgLIilIDRNnZnh9J/R1SpgkL7qKzV7VoYHRryAg3LHQLM QS3ZYgR2f6CnnWq+gASLKixUJDCsvN42uXktjQXq+ssUk9ZFAF2Ngeh9V336Z9+hCR6u nkBbet8aIV0EwrBuc2YODkseEi/tD3q9sx/z1gm5ZWPWYgubnrSWJ4EXXJXfM3PrV8L4 3ZWA==; 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=1710401458; x=1711006258; 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=iSUhful2V++t4xBXKZCe//tdC/z+0DWNGaytUgXZbEw=; b=rQHAFOsLwJRq2BKCzxYeLqj0yHSMQ9Lo0q+7rc9T0vV5utOZhXTS1HvKC6strODylb pfzgaYVzwQBaVo3LgNR6M297+NcDVJ6eWA8pZqbQY1P6iV7ytRVCsEoju37yTEHDixN3 f6y3qX3UETSfofWZ+hDMDIY8GWUfAT7HP3YzokBIZpTDIBaOlc9JKWtCPOJTtfFmbE67 ZGvfsXJimkFr50ERCaFKKBuFZerYokXdKCuUcl00QvGfkoJrt7BzNII1jNrwh1HB8jAh h3tP2ytzOcLcUdHRmORALrAmhx7NhlPtRG2pqOcZPdI9oOKo9Yl+uFDxZNYA0yP7ctp8 STWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710401458; x=1711006258; 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=iSUhful2V++t4xBXKZCe//tdC/z+0DWNGaytUgXZbEw=; b=xCtVf85g6mzmSMAWas9dp8bI0kSKwLLyYCL2DGj8r6K9IhLEZdxKjQGUTGMPxT8djj wIxqSDhuj2DCJ0f/kbwMMuByl8TmdmNfnn9sWrnUXYCzfVlCJ1eEEwuu12iOLqjCprca 58H0gra6K+JUNLU8PWuM+OysSXc1+0Z7M+mWprLcopiPOqb/8PnNZ7G+Qac23Cc5aV31 T0eB5rzyjAh+agSKC6nt6FBVPMbevV9UZ1N1FPzIRAFm3Wn/EEergOuxmX8u4g+ZY5Vu fiD4eBjnRsjxR6388YcUaOHv20l5IglRQkTZ+SZ+tx/MVG8oKHtjtswudHueHbu7vm3O qPig== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCUeI0Q0aWVLiPnVLUw/C542Mf2etcxcgNDYEgMxLCS5IvBrQeYEqODcOzuC9Y7f+fG6FOeen+KSQQ3YTLrm+R3BxSwUaP4= X-Gm-Message-State: AOJu0YyojdiBxaTnZ6hdR5j1lJhq359bq7xmPJUL4xHNqLo4pbq1fnc+ 1Gwqv4Cst1bAPbi4ChbZLoOdWRLrKzntAiBHkn5jCx6Sg7KRaH2v X-Google-Smtp-Source: AGHT+IGtE6MDxEN2Eg+aFSWccNdg+A71Pru2fIEiXd7Kt/+z0W2MrdpO0lnoTBJQ4UZ2SetgyoLXqQ== X-Received: by 2002:a05:6512:32a6:b0:513:cfa6:3ea3 with SMTP id q6-20020a05651232a600b00513cfa63ea3mr626518lfe.6.1710401457651; Thu, 14 Mar 2024 00:30:57 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ac2:489a:0:b0:513:caa6:6fe2 with SMTP id x26-20020ac2489a000000b00513caa66fe2ls224279lfc.1.-pod-prod-01-eu; Thu, 14 Mar 2024 00:30:55 -0700 (PDT) X-Received: by 2002:ac2:5b92:0:b0:513:2a84:c45c with SMTP id o18-20020ac25b92000000b005132a84c45cmr540522lfn.28.1710401455183; Thu, 14 Mar 2024 00:30:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1710401455; cv=none; d=google.com; s=arc-20160816; b=05/S6Z5QcCDwULpshcYKeaWCbOS3074TFktkCIOawUZkTd9H5crfamlZfS2cDz/+ty vKSwY2MxFKvM7hLwRtGPZgTtVumgTYQvWoc6oXMiimp3N7zKE7qVmUQ3S04M4kbM2WU0 ZCXe3oZYlQqOOApsPz0GaUW5CpcqWcU3D93XucehkXwFjtYP2jTeXL48BjqsIg3u/qdL 60UBGcwGaCsJ0+bkOw+QWbCR0+C8moUWwp0rIs/d5k0Q0P3B1wUHqA9Iobh/PwEu/6dq hTVIu4TlzwhiZrHNwimaj88mo0GyfXV/jpcu5+lAogCHwhTwTsUnNd5PNQja3Gh4gnXn Z9cA== 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=yYychC9Njwku80EDzk/5wi/Z0p9Sky7lipyhrqj2+NA=; fh=7tclEdh7YbwSQowgJ6LNq720O7H5HTEaqj22NJWRE2E=; b=zTR9OqI10p+Y/OYdHg9Q9MrC6Npe9HKp5bM0rSuLWwTgP7G3wQheDbyBGMcIJgARiY 1Go0E2Z82JlcGga2v6M5rh0SPARbG64IqOyg4vTD7ujeMmTPbcF5bLUanb033zcYTwEp 1VukOKE0W/zSR3Qp9gIcCyMZyJRKKTwgwIRMePGL+oQvwJ9Grrfv8yvV+shuAsam+gDi 1jS80J4FsBvwAEUvQK9pzFC41PjBptwp0MqxP8aMe8t9ZMUYYiGyoNb7d0+FZe3AFd0A +2E5w/+mU0L+AH39INjdi7F6/WSP65LViulhQm2gRNYmSkE0KHl3QwWGkgNvPk6IzuZT XxVQ==; 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 q1-20020ac24a61000000b00513c1ff7958si55570lfp.1.2024.03.14.00.30.55 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 14 Mar 2024 00:30:55 -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 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 42E7UoA2021482 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 14 Mar 2024 08:30:54 +0100 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v6 07/11] meta: Add cache-deb-src functionality in base-apt mode Date: Thu, 14 Mar 2024 10:27:24 +0300 Message-ID: <20240314073047.29465-8-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 X-Spam-Status: No, score=-0.9 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,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 | 17 +++++++++++++++++ meta/classes/rootfs.bbclass | 3 +++ 2 files changed, 20 insertions(+) diff --git a/meta/classes/deb-dl-dir.bbclass b/meta/classes/deb-dl-dir.bbclass index d36b7190..2bb05b31 100644 --- a/meta/classes/deb-dl-dir.bbclass +++ b/meta/classes/deb-dl-dir.bbclass @@ -41,6 +41,23 @@ 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 + + srcpkgs="${srcpkgs} ${src}=${version}" + 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 13e06ae1..ad4e728a 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