From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7032253102499561472 X-Received: by 2002:adf:f6cf:: with SMTP id y15mr7158928wrp.56.1637324025702; Fri, 19 Nov 2021 04:13:45 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:f1c2:: with SMTP id z2ls2906009wro.2.gmail; Fri, 19 Nov 2021 04:13:44 -0800 (PST) X-Google-Smtp-Source: ABdhPJxdNtJI36VHlpMwr7lYS6N98URotwvVPtSXY3dhlYBHN29CY/aShBYu6FiUkTKmsRD5QQiL X-Received: by 2002:a5d:456e:: with SMTP id a14mr7005638wrc.256.1637324019604; Fri, 19 Nov 2021 04:13:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1637324019; cv=none; d=google.com; s=arc-20160816; b=fgkdSFmhgqzGnKbqqrgBWC3mJAzyki5nqRUvAmoRZy8VJVIJvBh7wGUHkKKsS6Tc8z 0EGscwpUQ4XHs41bKRpd+sNaYpZrJBMkuwuao2or9YRl6hUXJrDgVs/VYihqreyHC+M4 ujmnlBt4CnTBmCQwH0sc3GEnB/KWs2739qNEPFMDDb7GwW1U7YZiSbAfd6BOKH3loy0c t7YkuuRcpNqh+9hjnYQmjdoqwTwFh9shEU2dgTn0IpCsyVQDYmjDawpBk6ulIefiKRvX WHnNnm3p39I2hqQOH4woQOm8AcDcfd/liKcwI+NIEVvvtD2PP95lXUNk/EHlS7yWHowk 7xzg== 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=jULG3YWKcT38207yHNQIs8CmbFBXf9E8YdwZL7NOXXs=; b=YxMYqRGKOXWyiPYOeNfqxyugzLGyEqMPMF7ejCqAdmPtRmBE2I16WGyOWhgpsd8w5m O8131dinbcuM3nL8CoEDEoHfQDMV3B3i1myKI6MpoM83ujLYDuL4umqBGaSq+Fq7ErEo W0FN3zFxRBkTQ/M6U+OjfyBy08zx22Ue2Cj7GscinCjapOPTi+6snwA4AWDAfVYAkmCw FK0m7dXS2sKAEbW3MQoBIuZARSqueFND1dk6NQ0MGwbtwaiJGE8X0D4SMATlUE+nlnlZ fq4WA6ZqFXHMksR7DXnDdk5Rco0m71KxSHUsTx7fIBwW/PTZH4pUUBPhfVGCNegBIfvV 2q+A== 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 Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id q74si868204wme.0.2021.11.19.04.13.39 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 19 Nov 2021 04:13:39 -0800 (PST) Received-SPF: pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; 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 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) with ESMTPSA id 1AJCDX7P021829 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 19 Nov 2021 13:13:39 +0100 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v2 15/24] sbuild: Mount base-apt in schroot Date: Fri, 19 Nov 2021 13:13:24 +0100 Message-Id: <20211119121333.13805-16-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20211119121333.13805-1-ubely@ilbers.de> References: <20211119121333.13805-1-ubely@ilbers.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED 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-TUID: Q9Aoi/eK733s This adds mounts for base-apt inside schroot and adds import/export deb files to/from schroot. So that it becomes possible to run second `cached` build from local base-apt repo. Signed-off-by: Uladzimir Bely --- meta/classes/sbuild.bbclass | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/meta/classes/sbuild.bbclass b/meta/classes/sbuild.bbclass index 80f9ef25..474333e7 100644 --- a/meta/classes/sbuild.bbclass +++ b/meta/classes/sbuild.bbclass @@ -72,6 +72,8 @@ EOF fstab_isarapt="${DEPLOY_DIR}/isar-apt /isar-apt none rw,bind 0 0" grep -qxF "${fstab_isarapt}" ${sbuild_fstab} || echo "${fstab_isarapt}" >> ${sbuild_fstab} + fstab_baseapt="${REPO_BASE_DIR} /base-apt none rw,bind 0 0" + grep -qxF "${fstab_baseapt}" ${sbuild_fstab} || echo "${fstab_baseapt}" >> ${sbuild_fstab} if [ -d ${DL_DIR} ]; then fstab_downloads="${DL_DIR} /downloads none rw,bind 0 0" @@ -107,11 +109,18 @@ sbuild_export() { schroot_install() { schroot_create_configs APTS="$1" - #TODO deb_dl_dir_import "${BUILDCHROOT_DIR}" "${distro}" + + distro="${DISTRO}" + if [ ${ISAR_CROSS_COMPILE} -eq 1 ]; then + distro="${HOST_DISTRO}" + fi + + deb_dl_dir_import ${SCHROOT_DIR} ${distro} schroot -d / -c ${SBUILD_CHROOT_RW} -u root -- \ apt install -y -o Debug::pkgProblemResolver=yes \ --no-install-recommends --download-only ${APTS} - #TODO deb_dl_dir_export "${BUILDCHROOT_DIR}" "${distro}" + deb_dl_dir_export ${SCHROOT_DIR} ${distro} + schroot -d / -c ${SBUILD_CHROOT_RW} -u root -- \ apt install -y -o Debug::pkgProblemResolver=yes \ --no-install-recommends ${APTS} -- 2.20.1