From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7075595997826514944 X-Received: by 2002:a05:6512:203b:b0:472:4d8b:b124 with SMTP id s27-20020a056512203b00b004724d8bb124mr18408564lfs.241.1651761596277; Thu, 05 May 2022 07:39:56 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:3f16:b0:449:f5bf:6f6a with SMTP id y22-20020a0565123f1600b00449f5bf6f6als1215006lfa.2.gmail; Thu, 05 May 2022 07:39:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwu9DNUf14JngViANd4/28JxqcBpQa4e7tKeiDDknZXBK4jSdz0w9GeRlONnMfbmdvFQZvs X-Received: by 2002:ac2:42d0:0:b0:471:fc7b:e53a with SMTP id n16-20020ac242d0000000b00471fc7be53amr17237135lfl.185.1651761595347; Thu, 05 May 2022 07:39:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651761595; cv=none; d=google.com; s=arc-20160816; b=ECQZXDAzcoQastORElBj3nA/v9z5y4RFhSNk1CCYZ5es7YCVsqQzsCsLVcmAWRNkmY Q1VEVmenEveP6jgSin4UUlSKWo6Cs46i3ZB4bbCtXjCtb5XyCtq1nvIQKn67Yu7Jb13C J2nCrHJV3GT6zFX1lCEdmjzIujZPQGh0CBRoEV+1uQmVzXVCLRfF1l0n8OQlErehXnFR FgeMP8j2iarCkLXppOUXhSXYOMtw5n0xmD6n6qfQnGNY9xX4eq8YvAnyvqBLN8FyZ6Bc yX13cZ9TKkf9WQ8BEMJE1zYyOqoaMW7UnL754m8oo/okd97krqrEVx0rWINEsbq4Kl4l HAMg== 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=1/MFxE2Ttnade9on6p7cYNyYcOJZ/90Qxu2opGcjsXI=; b=wVbAPMEh3Wb0uhsoB6qVJUAU6q0mtuARwMx7YOB4Vvt9RQhe9f268GUuDClXXqvw5K TNQdo1cQeBpcsFeHTQXFSn07oMugQu9al4yduSt9p8ZNsnAaqAzeT/9V6+UeNUVPpggv QB73aXgmd8rB+hbpKfKbdPmy9T1hu67CkL9wiJF0qweYbZKKOZwGUE6O4di3UcoecsBe oEbTcA3q2oWJ4dh2q7hrw44AUcUauaXFNGNBwkgE5LJoltp+cxWRkQnkRmEv760WwqmF hRDRoyWlDhSd5s8bHZHi/4moU0k94IVZps0US8u9SlGqI+r/Q6bjnJBSEYQsHzlqZbI2 +Z0w== 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 h13-20020a2e900d000000b0024da01a8c6dsi81125ljg.1.2022.05.05.07.39.55 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 05 May 2022 07:39:55 -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-0-74-214-37.mgts.dynamic.pppoe.byfly.by [37.214.74.0] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 245Edf7d014026 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 5 May 2022 16:39:54 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: adriaan.schmidt@siemens.com, Uladzimir Bely Subject: [PATCH v10 11/19] dpkg-base: Switch apt_fetch and apt_unpack to use schroot Date: Thu, 5 May 2022 17:39:26 +0300 Message-Id: <20220505143934.16096-12-amikan@ilbers.de> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220505143934.16096-1-amikan@ilbers.de> References: <20220505143934.16096-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: OKSa/y8IB29D 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 df42e41..01676f5 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.17.1