From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7057122428766388224 X-Received: by 2002:a05:6512:2283:: with SMTP id f3mr4197877lfu.198.1644475586203; Wed, 09 Feb 2022 22:46:26 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:bf1a:: with SMTP id c26ls749664ljr.10.gmail; Wed, 09 Feb 2022 22:46:25 -0800 (PST) X-Google-Smtp-Source: ABdhPJzRaDFZeEBrpjJBaJBZ8eB9IrGt8IEagrfm3gIxDMnNlij2pId8zuvOMPIeNdMOfQ0VNnpJ X-Received: by 2002:a2e:994b:: with SMTP id r11mr4134297ljj.412.1644475585252; Wed, 09 Feb 2022 22:46:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644475585; cv=none; d=google.com; s=arc-20160816; b=YCBa7GiT08LhU0sl/BFNQ8V1OMEKZkfHOmDvVP2xKs2rvH8lJHtzGvjdew67uXSt+4 cdzNz80U2xwTst+BGGja9mEWeApuiiSg3boZB3iQPdY+SeZQEPG+Fusu1wlC1P07wi1d gwcBcI1fE1u7cFGNn+al4ooDVH/KUQpYaw+LYJ0UwFhTlmckuzuE99uLzdm0UkfsBY8j ibXUn96NvN7DB7npaNQ5isY2Lcdh0Q0bK9NmnfyZ08Rw8bEEcDahytP6S1bKUjAPlmQq JKp2KgN4h6svMLrbfXV0AFFAf0WHD9H66gRXSl4whwerqyxJRe+DjNIEva1TJmRWt0Lz Q3Cg== 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=D19PloB/A7EcdPxAKqmQxlNkaLEb7TZeWJhTGQ5+O0U=; b=VOYLdS306CLzBB8fORQKUKYGd1bgcLDpLIK5wltyF+vPrWubKjFGIPypevyx2xGIVH KweAi08yCHaHqT0XP0cOy1RplkJ5aS7ctEijEY3ABAgke3/Tw70vrgxNxZRIGJduir6W 9w5eX33Bvv84Bqn7wAdnI8o99k5rph6KnQKp7+JwMBj/9/gEVvXxQjQGV1eAGVurfTmL WaUWPkmPGGLgO0JLbUOlEZVUoPrib1MeaDWQIwRF7dA0zyZD9MBFk5Lx448yq8qLI0u+ nUATDQ3/ztG0jhI2QdbRKewFq+PO8hzh+WFh4Bg5X7QbLCzPvIlBTkbdpQD2R6i+7hWe Rh+w== 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 o2si124150lfr.4.2022.02.09.22.46.25 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 09 Feb 2022 22:46:25 -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 21A6kKrD028169 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 10 Feb 2022 07:46:24 +0100 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v6 11/12] dpkg-base: Switch apt_fetch and apt_unpack to use schroot Date: Thu, 10 Feb 2022 07:46:19 +0100 Message-Id: <20220210064620.4392-12-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220210064620.4392-1-ubely@ilbers.de> References: <20220210064620.4392-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: UhqIhiI0P1ds 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 238a0bbd..7220f64f 100644 --- a/meta/classes/dpkg-base.bbclass +++ b/meta/classes/dpkg-base.bbclass @@ -101,19 +101,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 @@ -122,13 +115,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")" @@ -137,8 +131,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