From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7075595997826514944 X-Received: by 2002:a05:651c:160b:b0:247:f955:1b18 with SMTP id f11-20020a05651c160b00b00247f9551b18mr19673552ljq.427.1647415580690; Wed, 16 Mar 2022 00:26:20 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:1693:b0:448:3742:2320 with SMTP id bu19-20020a056512169300b0044837422320ls717364lfb.1.gmail; Wed, 16 Mar 2022 00:26:19 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxtW0TxH3RtTHeH/wP0sovby19hnF8xnWnPFKOfPIwBMqNNsPyRuDdzxEeaRlj4RpwwANbP X-Received: by 2002:ac2:43bc:0:b0:448:2e00:8945 with SMTP id t28-20020ac243bc000000b004482e008945mr17743842lfl.300.1647415579783; Wed, 16 Mar 2022 00:26:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1647415579; cv=none; d=google.com; s=arc-20160816; b=Eat4l/brE+n+hbHp14ypAD8EsK3L0v6ibTSNiqQpEQ3t/k65R075aNJPfmF355Pmuu uBIp//0fgU+lxT6rXuFa/h8+fmoBo1/hKhI3xjGjtDWDNTb/W/wAvbn4BWZZt6uDpoWJ xKA8oV9tiMFmHHaHDquX2knFs72njp8myVUso0TRCEY/+KqV4y+z7CZ3md4gdu5uf4tX 0GSa0IV5CcYqjF1PY0cRtkLANF8QBWhIsqJE3IZNH2jvvD7VDMMPzlmgkVVuJE1d6n4e hfyN0oynG15ygmVdJF0XTtZWRJw9SLlNc4Kyzib7bGQld5FtCgL9nlxDJocXYqbqMt0+ vKmg== 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=PzMy8UIsxOBwiYxTsn94/j/fyImOIKZssOFvsd6G+Esic//GopzZhywe0DNxCExfZG sSy2PokoFP5/oogkfEuIsaSDSG9bLvPOwd1C1/EHJnwnDVb7GaT1jpSaTRrkDhL013u2 RcklORgqXDp3IcTsclKHhr94e7y94HTYkg3CIoT5uyN1jHAm0zGA4cBa2FIP2Do7PbyC t9uyv+tz5wgYuZutZFtBYSh1YpnLOtJmU193Rk+L9lIh0Yv6D6NiHAED3wI7gm6+ENa4 DO6Qb0DKEQ7dA2+y5rBuXYtSZSyvVoxHrg917NNTJ9VtRn3GqHsXQcn6BPbFvesmlUdK aCDg== 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 e15-20020ac2546f000000b00448ba65ba9csi35800lfn.13.2022.03.16.00.26.19 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 16 Mar 2022 00:26:19 -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 22G7Q7dp021517 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 16 Mar 2022 08:26:19 +0100 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v8 11/15] dpkg-base: Switch apt_fetch and apt_unpack to use schroot Date: Wed, 16 Mar 2022 08:26:03 +0100 Message-Id: <20220316072607.20518-12-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220316072607.20518-1-ubely@ilbers.de> References: <20220316072607.20518-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: cJFe3/4WnpBr 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