From patchwork Fri May 26 07:00:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Uladzimir Bely X-Patchwork-Id: 2845 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Fri, 26 May 2023 09:00:45 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-pl1-f187.google.com (mail-pl1-f187.google.com [209.85.214.187]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 34Q70hv6013383 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 26 May 2023 09:00:44 +0200 Received: by mail-pl1-f187.google.com with SMTP id d9443c01a7336-1ae437c2b32sf3317005ad.2; Fri, 26 May 2023 00:00:44 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1685084437; cv=pass; d=google.com; s=arc-20160816; b=xl97rWopEZJJVMeTLe/jv6L9xljHAhGA9gBM5r1huxEKHuxJjNQWAkajkEWGFH9dPq eP/JVNYfdPLS6O4U3xRuBKSIKsfhTpsJGJgWFjotJG1ph4+0eRADI5vXG4MaXNgzjEim 7CPnAmEsRKph2SMBRCmkHZ+QihxAmEHvysPO0dr/i64+GSnDfehoFHBQ26866KMpOd39 dg+ow95q1LwDCn/dKNOGqQVXUsfMWM24gbQ6nLY9GL82tiRRLb09L9p4ER/DDijOjYW1 aVzggZOiBPFOGxhqJG6VjpecVduAMZ1RkMEY5mpuINp2s1y5LVITx3reBEpFEYjJT/lr msQA== 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=SIeqZudAH0mrcXTur8V9ULgG7mMSnRRXF9cCUQtPkQY=; b=LVgt1uq0bbGWzGp4ZPofuVDAlNKVXNALtOvss2fdpvPWdBVID+zjWGGr8VAoDiSroJ 1utzQG7peSi9xzQABn2PYRJq3fQhRb1m0YNWf7JGnA/u/YP78r5Be+we53nDRv3kROdH EDw1Gp2PTO9aE+4HBanVkA1QrgJYLwXnHsZDQyARa8wGTiRapLh5X2FMew6d/JBjEciS ayYEdGu0GBtohVTtXevaOrsfTSpTlLeGmGch2OlaGJVOVUgYrNpgv0iPd3E3o9VFuR3D JOBnuNFJ4UmD+7VxKNc3NYcc8oRAi0av4KuIXUzy5JycHKSiAm3xvtdXMyffi5QnbGsg IVeA== 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=20221208; t=1685084437; x=1687676437; 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=SIeqZudAH0mrcXTur8V9ULgG7mMSnRRXF9cCUQtPkQY=; b=qFbGdz98h8nFz44HICF+EKhsjB8B/JjxWE/paaEwCx/aXhpA1QuNX44S6MrUYUcK5a ITgmlFkpJi8EXGgqbzJbBXGQZtqDJqs/j2DEkVgw1vVpQUkllmDd7gNLrwoH5La+iqiE +xxAyPlnOrWaAwLqGaKB3JsZyHg7Nftf4GsFxO/+e8fCR3OhA4RcFcVAXM//1Pruy4Qu VodIllN/cywlHLgKCCEsYfVeeKZnd/Jt5ZMRrEbXLjWynVuGMmMFkLDEHvRa9ZUuWlSJ 2KLzsOZ+Or8yzSHXUL1bMm97mM8zGFHQb5+HlD8DBWsGdGi4jfGfdY8LL6LYPgJ7qiUg jevg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685084437; x=1687676437; 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=SIeqZudAH0mrcXTur8V9ULgG7mMSnRRXF9cCUQtPkQY=; b=YvuRbnfAW3XaBUC+i1CxWDJDP2RrMJmUwRQcbEdGbvfMoLPnIf9pSYRmtjy7EJfRGH IyTSlmFRD3IbkYEE6aMh5V7m+n3UZc6/jlHhtnlrSrQ8HvtjUZCHGxqhB8k/FmSm+iq6 VpYPOS2N0/a9QXmk2m/1qc51Q+P6Bs1UJoEp51FYKj6JlEwLeHQCox25S4fC9hQl8z9D zXzW4PAnE2MUut1/tdldNnafTpOeCHBklcwEkRtM9w5Eumfh5CnpobNpqYtefDxgzwdR OdIlp9aYvOvL5F5ikg2J6l2hYDS7crP8p5a0EBeWFg9tFELb8xc5ySEXSEylZkj5okXW Q1ZA== Sender: isar-users@googlegroups.com X-Gm-Message-State: AC+VfDxXsp280lmx60VomIXLI3i4CENaZ4HZJpJNDKM3w+GrT1t8OYrg kd/0Ve1dCENt8VUYonCcGEQ= X-Google-Smtp-Source: ACHHUZ5mH9Pg05BQOiC1OZTJgzbbBEvvw2U4Sj7niaIZZPZrrJfNFggRNY73JCNE/KvkRr3hENERGw== X-Received: by 2002:a17:903:32c8:b0:1af:aa36:14 with SMTP id i8-20020a17090332c800b001afaa360014mr1895287plr.11.1685084437351; Fri, 26 May 2023 00:00:37 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:903:32cc:b0:1ad:d7a0:1d80 with SMTP id i12-20020a17090332cc00b001add7a01d80ls1981195plr.0.-pod-prod-07-us; Fri, 26 May 2023 00:00:36 -0700 (PDT) X-Received: by 2002:a05:6a20:3d0e:b0:101:2160:ff8f with SMTP id y14-20020a056a203d0e00b001012160ff8fmr1185746pzi.11.1685084436450; Fri, 26 May 2023 00:00:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685084436; cv=none; d=google.com; s=arc-20160816; b=G4ZPymPu1appLegYUrWLp9p6TR3k9/PSFBXnicG3qXFlD4PLGKiY66xfkTnKGtd2t/ yRKpcfzJwvlDkqJc/PmphILI4nXP24JHC8E/Ctvm2Ypwc9euxUOODI9QjuZXzA9ks0J2 9U8Gexs/CNg7ovokSXX2pYXmOf2CiqwIJdlnaYCIsHOkD+iw0T3qNCux9Usf3Tqynd+X oXg2bGcOLkdptlLjFPTeZGhmqG9r566u7diifsvc75kGWi1VFAqRutwYzY1C6vVOzQYr b/YBDBmuw5ifiBfR9mZywKjwFyl8V0T0a2ppW3nOrGSWUB01KRSDMFC8202p34poKUBa 0uXg== 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=j6nq0sfrjvwH/slo9fAvomeI09KVXkUzgZec3JMu5h0=; b=PZiJchuQ8pepEWOOczxqI5+RbSB3vbOxBl4ff6t+pEoFrYYYO4luEtahWba76og7Y0 sijH0PubWucbKtJqg+9kS2JA1p7XCe86KOAv1Dr4s7iB6uu/pKs3zejFtL3S6UCvS61/ rFaRFQRm3JUQHWkRSkdKXfltUskFcVywxHBc5D9lyskdUMS5ysjpFwpWvBW0ISN7OW7i goveUi6ofyqakuIfPqvara93EKgBn2rNYFNdHKwlOLjREr6bHtkDGe62JYx/Yx8ys7kP ZfelOPHfnIgs3l4/J9iPzx+z4hs0Lx6vESuwRXKKFWef/cvGc+M6KrySQGVQ1s4jsIBO HR7g== 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 e10-20020a170903240a00b001ae20d30d75si54777plo.6.2023.05.26.00.00.35 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 26 May 2023 00:00:36 -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 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 34Q70R3d013306 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 26 May 2023 09:00:31 +0200 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v5 09/12] meta: Add cache-deb-src functionality in base-apt mode Date: Fri, 26 May 2023 09:00:24 +0200 Message-Id: <20230526070027.16890-10-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 X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,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 | 4 ++++ 2 files changed, 21 insertions(+) diff --git a/meta/classes/deb-dl-dir.bbclass b/meta/classes/deb-dl-dir.bbclass index f0ab9714..a7a8dcf7 100644 --- a/meta/classes/deb-dl-dir.bbclass +++ b/meta/classes/deb-dl-dir.bbclass @@ -43,6 +43,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 47f07129..0ada4721 100644 --- a/meta/classes/rootfs.bbclass +++ b/meta/classes/rootfs.bbclass @@ -230,8 +230,12 @@ 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 if [ -e "${ROOTFSDIR}"/etc/resolv.conf.isar ] || [ -h "${ROOTFSDIR}"/etc/resolv.conf.isar ]; then