From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7032253102499561472 X-Received: by 2002:a05:651c:1035:: with SMTP id w21mr24091999ljm.278.1637324022459; Fri, 19 Nov 2021 04:13:42 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:2610:: with SMTP id bt16ls223477lfb.2.gmail; Fri, 19 Nov 2021 04:13:41 -0800 (PST) X-Google-Smtp-Source: ABdhPJzh2g9cKAY1fCV6IsYegJ7PtgWsrIP5Y+2Y8SwucjPl5OyxqKKAgDLO/f7FHh1ofEzcxUL4 X-Received: by 2002:a05:6512:3da2:: with SMTP id k34mr31942402lfv.605.1637324021394; Fri, 19 Nov 2021 04:13:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1637324021; cv=none; d=google.com; s=arc-20160816; b=iMfs82uy89uwe82KbFfUZ7eDfA/C/PNovQ0OBLzUwlZOuvzlgrR+jIGQ48wXtCmNSU Y7cp7QPwUO/j6jNXe1SaqnVXJXS0IzFej+HTMtCO5F6y46jUhzIWhDRIlgn/heVBj4Jr YKfr+1npuwaVABpF1t3bO7ApdlsIUttpcRaHXCRYN4Y84aC0mmbOvMQxrw747Yq9ZOwk wLW5LjOJ4OmLQl8K5+GF1sQyTGNe+3Sie4bLYMarlOGgsPM9G+XrFYDeSlANH4waLBNH OgdGkYFu+VF1TDXsp28ISUGZtvN32mcwSTYWest8F7UOv4maedxXe+1ArdiwoXK7QLYB 42oA== 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=VNfFB/dxiP1hXzQd3ZG+YSBlnrmkuBj2O1zgGOOMXQU=; b=xDb5XhvhKPOGaYOi1iq6e0ThmKp5a/ODM/7F0NEcrvaymlvq7YqLalwy3sN74zmRwn CUA1AtXYaIW1Vbg99sH0qPSvn1VsQNhFdsd1AjCdxnKC1MwC+7L0SCgRBbr+G2CZLUBU CzbGqhiDpPwnql9qP3lkRcGDvjAKKO+5XA3xxqvYupK+YivQ2WqBeMc7utrQrS4+j1MP OxduOGzD1oOM6SRTwY+eWYB3CbaXJ5s67QKZQsh00ls2R0NVhRGKnXPYOHS8b8+QvmO0 9heEMUo/fXef16PN0J5JJKp5IYx1DDNzSIfPodCJ11zHcfl6ZbEYUoRYbJr5wvGEZDKx h1XA== 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 t12si217139ljh.0.2021.11.19.04.13.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 19 Nov 2021 04:13:41 -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 1AJCDX7U021829 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 19 Nov 2021 13:13:40 +0100 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v2 20/24] dpkg-base: Switch apt_fetch and apt_unpack to use schroot Date: Fri, 19 Nov 2021 13:13:29 +0100 Message-Id: <20211119121333.13805-21-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: jNQuu4W4b8VG This moves downloading and unpacking deb-src to schroot environment. Signed-off-by: Uladzimir Bely --- meta/classes/dpkg-base.bbclass | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass index 861b2cb7..f530df58 100644 --- a/meta/classes/dpkg-base.bbclass +++ b/meta/classes/dpkg-base.bbclass @@ -97,34 +97,25 @@ python() { } do_apt_fetch() { - dpkg_do_mounts - E="${@ isar_export_proxies(d)}" - sudo -E chroot ${BUILDCHROOT_DIR} /usr/bin/apt-get update \ - -o Dir::Etc::SourceList="sources.list.d/isar-apt.list" \ - -o Dir::Etc::SourceParts="-" \ - -o APT::Get::List-Cleanup="0" - + schroot_create_configs for uri in "${SRC_APT}"; do - sudo -E chroot --userspec=$( id -u ):$( id -g ) ${BUILDCHROOT_DIR} \ + schroot -d / -c ${SBUILD_CHROOT} -- \ sh -c 'mkdir -p /downloads/deb-src/"$1"/"$2" && cd /downloads/deb-src/"$1"/"$2" && apt-get -y --download-only --only-source source "$2"' my_script "${DISTRO}" "${uri}" done - - dpkg_undo_mounts + schroot_delete_configs } addtask apt_fetch after do_unpack before do_apt_unpack do_apt_fetch[lockfiles] += "${REPO_ISAR_DIR}/isar.lock" -# Add dependency from the correct buildchroot: host or target -do_apt_fetch[depends] = "${BUILDCHROOT_DEP}" +# Add dependency from the correct schroot: host or target +do_apt_fetch[depends] = "${SCHROOT_DEP}" do_apt_unpack() { rm -rf ${S} - dpkg_do_mounts - E="${@ isar_export_proxies(d)}" - + schroot_create_configs for uri in "${SRC_APT}"; do - sudo -E chroot --userspec=$( id -u ):$( id -g ) ${BUILDCHROOT_DIR} \ + schroot -d / -c ${SBUILD_CHROOT} -- \ sh -c ' \ set -e dscfile="$(apt-get -y -qq --print-uris --only-source source "${2}" | cut -d " " -f2 | grep -E "*.dsc")" @@ -133,8 +124,7 @@ do_apt_unpack() { dpkg-source -x "${dscfile}" "${PPS}"' \ my_script "${DISTRO}" "${uri}" done - - dpkg_undo_mounts + schroot_delete_configs } addtask apt_unpack after do_apt_fetch before do_patch -- 2.20.1