From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7057122428766388224 X-Received: by 2002:ac2:4e02:: with SMTP id e2mr16524240lfr.50.1643114360823; Tue, 25 Jan 2022 04:39:20 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:3c97:: with SMTP id h23ls2017257lfv.2.gmail; Tue, 25 Jan 2022 04:39:20 -0800 (PST) X-Google-Smtp-Source: ABdhPJy+KZqm2Gb6bbU14/7izrYNZIxYKlw4vG5UNp2xr/E51UtzXPkrry6BEHfoBc7uOUiDu9da X-Received: by 2002:a05:6512:4d9:: with SMTP id w25mr15288275lfq.355.1643114359924; Tue, 25 Jan 2022 04:39:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643114359; cv=none; d=google.com; s=arc-20160816; b=hSxDH5JHqGjCxBiWll2wWwb2+EPWL3vRbl5GoAl5pTQ/wUq+ZZnaMFBruKdgIO9DXE utZYvqraEkdkuWshZr5Y0gs3/EOyqZDeesq1JfQVtyOFn3opvra9LP0XnxdVeDL8wcVN Mdj7NCFa2RcD/vG4+4DMEKs7QL4WNgSC4PlykdtIvYADvd+RHIYbsxKn+hkdSpXIgvhH zCtzVCGr8VisD9tkP2fN8CWwIbsN29QCvPJGrHEEV6UOsN91v1cf7hR0XmQmpfBP5a7f hpKd7Hnx9D9p/bAcySeN/o7VG23B53y6/sHuF5IQVImRL1fKxIQRqeW2R+25kAphOgLo l9aw== 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=cQxdTDCkwaFDqSSYHDNUY0pGHQx0bkfV5qJlHEIgDCM=; b=RG81J8GH/eI4kf0gwRL5pf79T5Kd4mr1fDcJyY9Ozc8dbscaYBCjrYjtysZLpHjf1T LbDS0Y7HgnhVVHtCHLVn0M1LI4Z1ib2mcWwbwMurXWaDPu8VGIcmUNcAoTlTZ/UVhp8V W04QJHJdZdK5c7Rbq3iNrqlYGomPuxOfPCDmT4rDOJIEnHVqkjwCRguaQhCyhAY6DW8M KWgx1mcIsD/bHWbpi8UT4bgz77PD9MGfYbbdAmrpgjT+VZhWW93MF6emxSvOmD2gdSrP vpR8221WdcWs9fJnjTJPRpi1wSe2qFa1HnW3rSky+vELzDqaeeCw7z5wEr9s9Ny1GBQu nTLw== 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 d22si454723lfv.1.2022.01.25.04.39.19 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 25 Jan 2022 04:39:19 -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 20PCdFmk019254 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 25 Jan 2022 13:39:19 +0100 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v4 10/12] dpkg-base: Switch apt_fetch and apt_unpack to use schroot Date: Tue, 25 Jan 2022 13:39:13 +0100 Message-Id: <20220125123915.1053-11-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220125123915.1053-1-ubely@ilbers.de> References: <20220125123915.1053-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: w0o5iZV7GBd0 This moves downloading and unpacking deb-src to schroot environment. Signed-off-by: Uladzimir Bely --- meta/classes/dpkg-base.bbclass | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass index 4f8c3256..ea914cd4 100644 --- a/meta/classes/dpkg-base.bbclass +++ b/meta/classes/dpkg-base.bbclass @@ -99,19 +99,12 @@ 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 @@ -120,13 +113,14 @@ 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")" @@ -135,8 +129,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