From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7114179385042665472 X-Received: by 2002:adf:fb08:0:b0:21b:af81:2ffd with SMTP id c8-20020adffb08000000b0021baf812ffdmr16069587wrr.685.1656398977095; Mon, 27 Jun 2022 23:49:37 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:eb04:0:b0:21b:b3cc:1640 with SMTP id s4-20020adfeb04000000b0021bb3cc1640ls16525722wrn.1.gmail; Mon, 27 Jun 2022 23:49:36 -0700 (PDT) X-Google-Smtp-Source: AGRyM1vfKvnP0B61SKdhC1xSgdpP3vedlKPWP+7nZxT92iI3ckRUs8g1wxSnZt7VfLqiJzZR6Pe4 X-Received: by 2002:a5d:49c5:0:b0:21b:92d3:5585 with SMTP id t5-20020a5d49c5000000b0021b92d35585mr16339071wrs.318.1656398976220; Mon, 27 Jun 2022 23:49:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1656398976; cv=none; d=google.com; s=arc-20160816; b=GSxHX3Mh1NOmI/IC7HXFjnqUHyrNRJL3RTJp/rkGIJW2iZFC6wg5dbm5uvPjKn7L/8 I6nYDbPL3FrsPQ1bQNIYyQskklVNo3jHV/VZCUKH7e0wKW+YyrZ6ydnAMjp+VBFBQZvR lZsD5uxyNY5+9FKoxGGa0KpYsFA+yFix7dWzstvUmUjQOo8wWDhnLHSlhFAnJ6dsEouM wuZwJ38GtYZ8FAoUWdZZyrHa0hNs2zsHjUwkgjUEusJeD+HbKE7POM2l345diLLygwlV zxJ66J8ypl4LelSzd8IgNRwYatGCkO+PonBGkhA1taGYEveXutTkljQC3zWG8zC6MmT3 tWFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from; bh=WH5Nr/UYMFsrYFL6FTyW4EZrvxUeyVhwroYFAyTyIe4=; b=iigO99u4/14A9j1P5O4hZnf/1+aTD9wIwibiDtdg9IuOvVgdvuErAi/auaX4m/r8uY +9ztyi+7kP2sL+HwOiJ9T+wrh1z1kaBmKNLmdHsBxVtTMXs6+8DCcmX79vlb0ixy6pWj fHcyq6zbJKBUE6DloEKvs/tQGhwOs2HUh0IHcj5NWU8WcYEueQKriZfbmnsa2omZwLJm tDXstIhjXgj0S1mXm0yjlJf2wrPDwBTpMBJo2nxXTFoe4+0+qKiZe0Zb2VqW5UN8MR47 HK/E/pqyGb8He4nHbgrkn0qlaFPETarMkm/TyypIUUqaW7RaLfBXm5+4xhuAQyawAJpm FauQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id n188-20020a1c27c5000000b0039c948d7614si30839wmn.3.2022.06.27.23.49.36 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 27 Jun 2022 23:49:36 -0700 (PDT) Received-SPF: pass (google.com: domain of amikan@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 amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Received: from localhost.localdomain (mm-172-27-214-37.mgts.dynamic.pppoe.byfly.by [37.214.27.172] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 25S6nMSF030758 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 28 Jun 2022 08:49:35 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Uladzimir Bely Subject: [PATCH v12 11/21] dpkg-base: Switch apt_fetch and apt_unpack to use schroot Date: Tue, 28 Jun 2022 09:49:03 +0300 Message-Id: <20220628064913.27938-12-amikan@ilbers.de> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220628064913.27938-1-amikan@ilbers.de> References: <20220628064913.27938-1-amikan@ilbers.de> 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: chPfatJP9PPb From: Uladzimir Bely 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 7005aa5..87dc3f7 100644 --- a/meta/classes/dpkg-base.bbclass +++ b/meta/classes/dpkg-base.bbclass @@ -104,19 +104,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 @@ -125,13 +118,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")" @@ -140,8 +134,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 -- 2.17.1