From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7057122428766388224 X-Received: by 2002:a2e:81d6:: with SMTP id s22mr17626026ljg.61.1643734887709; Tue, 01 Feb 2022 09:01:27 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ac2:4e11:: with SMTP id e17ls928082lfr.1.gmail; Tue, 01 Feb 2022 09:01:26 -0800 (PST) X-Google-Smtp-Source: ABdhPJwx53QLkb3tW1Tr63XgmHJ764I4Y10talE1CrMyb6eiTkuQ3HyrbWwNuOutEbfs0DggZcq8 X-Received: by 2002:ac2:53b5:: with SMTP id j21mr19358422lfh.507.1643734886767; Tue, 01 Feb 2022 09:01:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643734886; cv=none; d=google.com; s=arc-20160816; b=xaSaeLWytSFXBprffQjClpz8BXgGwUDuppvuW47m+YS4sdW01+bynVCgddmoLXIf0U HRdSQrm2ZGrMwCklUZ67Ot0KqcXZBHjX8HsuwHRPgCVE4ePHvrLSU/g1bWHAh65b6JoQ +MYR/bwdbaJW0ZoSgutJs0rGjb+z2rh2zFRT6LW0tyzcnVrvdfoEOQbybaKEvBqK2i0G 3Wo0VMFrExEryMaEI4FYlyhajwQeICAtSq+Oul3QfLkbrrutE0JSq7Yi1769qG24IDL+ MZKibcR1GNWgRYf+XMbRUXL3+bMX1vJBaEpbrT42GQAGz+jT3Gj8lgXKOh8pjKEQUsaS aRxA== 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=Gzr/Q3LwAinHYu5qU0Cvvhp4qQ3KUf+L5ZMn76xmOPk=; b=sCW2QI4VQLvqCeESNWu2mAzRivT0DmV7HcEZZIZ8Nadf7C0w98YkegqNDJBN/bTfdJ xNunFto7DHY6ulHAsrL16+wPdLXonHcRHUCgBmnzY3CWAc60aPKRW7kg5xRvLUKNbQVx g5GmYL7RpKsP8ZpcUBIhFVfIv9/0VaTflhdJrHM8E8GoTNMbtxln/rlrH0RHp/ReGhYN fQD7QBOBSidB/idgvwne2T3Pvo/eWhRp9Ji24KvWl4HcHa07BEkYDPGRwUBj0mdmZmnu 6Ko3C1fteAzMPp5WkJOTDKCsym6DK/MFFJ0PzUkdGsxhVR5mDAdaEaTkDJA4hdl8iYq+ sjyw== 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 s14si691486lfi.4.2022.02.01.09.01.26 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 01 Feb 2022 09:01:26 -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 211H0cAF019722 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 1 Feb 2022 18:01:19 +0100 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v5 11/12] dpkg-base: Switch apt_fetch and apt_unpack to use schroot Date: Tue, 1 Feb 2022 18:00:37 +0100 Message-Id: <20220201170038.5723-12-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220201170038.5723-1-ubely@ilbers.de> References: <20220201170038.5723-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: aPkmRO7QMMmt 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 b1a16f67..39f20263 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