From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7075595997826514944 X-Received: by 2002:a2e:9c99:0:b0:249:146e:57a9 with SMTP id x25-20020a2e9c99000000b00249146e57a9mr1712850lji.319.1647492627210; Wed, 16 Mar 2022 21:50:27 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:651c:1241:b0:248:b17:7fcf with SMTP id h1-20020a05651c124100b002480b177fcfls798621ljh.8.gmail; Wed, 16 Mar 2022 21:50:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzra4URaGt5UiQK6ttx/XnRjdzuTix1KamamedsW16CrYYfnI/AUYngRWGTst4sRca33yB1 X-Received: by 2002:a2e:9142:0:b0:246:2c61:9dbd with SMTP id q2-20020a2e9142000000b002462c619dbdmr1769129ljg.344.1647492626152; Wed, 16 Mar 2022 21:50:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1647492626; cv=none; d=google.com; s=arc-20160816; b=HS0TbGweQt62XFVre2NKHmStnmf4qkNgADyR1FGp7KaOPxICsvEEbRkajEki5RvLz9 vOrt0tAeW/eTqw7l5O9z8nt5Wy//UhXkZOZrxjwa8Sj7VrNH+wDQrXbkCTJF1Izbv3ys cGytXzJDJNQXGCLQ0TL6w+T4yw2LYD7gLvDQQ06xlllQByDnIidXrP5jAcxViW4JpJ/F JBHjAmqDfgKm9OGRKuaQh3GzrSoL6rn0R3q1KavYquGWMo2c6x9TYFy4XfEXPdi181tP pyEEyaAiXK7Qw4yfieYC1tC9qju12kt2E8UkshzuQ5du2BqEf/w95qS0m0MK25uAS8eL uokw== 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=5mO/s5OCMwwF/Z6n0WuBT/sAdvx9pzlPUrUZuDi7dLw=; b=ZxphUP1sTEsvsGLBWmnrOpIpJwja+5MZ8FXA8apB5SSPwlnSWFRKUT6COMneivxIcW 8tJbmH27B6BihQssvSHuKGhtuEHD4MQFrXfKonwqanwyVrQMam+Th4FW68izhJZ75Gim q0Ns1AN52vcB9r/zuMxz/FPGqmOQ/K+7tU0Hm/Zz7o5wmV4KniAzhkpQ9uL7Z68jut4K qM2tUOYZ+z6mVVVYdhALiVoqegXL2+FOf1HJOliQMpz5wDi5RDUTEB5To2XR8yLznC2X VG/PmlxYGGgQbBQWPFcVl76QL5tE/j7VqQ7QejbdKq4gCWLrasG4B8YwiM6RmcB8z76i FbPg== 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 q17-20020a194311000000b00449fd1a5e8fsi1983lfa.4.2022.03.16.21.50.26 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 16 Mar 2022 21:50:26 -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; 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 22H4oLHi025716 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 17 Mar 2022 05:50:25 +0100 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v8 11/16] dpkg-base: Switch apt_fetch and apt_unpack to use schroot Date: Thu, 17 Mar 2022 05:50:16 +0100 Message-Id: <20220317045021.4018-12-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220317045021.4018-1-ubely@ilbers.de> References: <20220317045021.4018-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: jHrp8GRKZYNo 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 df42e417..01676f5e 100644 --- a/meta/classes/dpkg-base.bbclass +++ b/meta/classes/dpkg-base.bbclass @@ -105,19 +105,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 @@ -126,13 +119,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")" @@ -141,8 +135,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