From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7057122428766388224 X-Received: by 2002:a05:6402:10d6:: with SMTP id p22mr20524154edu.211.1643114360865; Tue, 25 Jan 2022 04:39:20 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:906:2350:: with SMTP id m16ls3952967eja.6.gmail; Tue, 25 Jan 2022 04:39:19 -0800 (PST) X-Google-Smtp-Source: ABdhPJzpHrQmSwWjF15mXqTrwYORNAnepKOiCcvstlprhTqaQX1CbpL0NTsFACi1Co80vdNBy5vx X-Received: by 2002:a17:907:7251:: with SMTP id ds17mr1807022ejc.709.1643114359908; Tue, 25 Jan 2022 04:39:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643114359; cv=none; d=google.com; s=arc-20160816; b=CWYP9iO/Rr9Fzt85PQs/rnzo6Qclgw/Y56zXL6NNf4MKPpXF1n+4OnU8K680c0KDJY TVVnpn7xM7H8t1A+XopYZPn6oMB4PnIIE7L3Qdz5WcHdM9XwTeavyrjc4pW9tdFpo/uV FAMCjO77zI/Yt59jKcXLkTL3FaQBuIdVmuwLWvYwTHvn8V/6f532w06AlIblA+syGOhd vVW+B6wWxPl1rrgCW5ScJUuW1IRwxcij2nieFRlxvFqZsp8UyR0D1aICAtRKn3R5EHNG XFipXuW26NVwJFLfegS6FCfeSR7E7q0HnFoAowf+Rt68etAyjFDW/wTM80jHC9vF62BR cpCg== 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=sA4NYuz4PG/CiOTf0wgP907RfOc/GHxTKXu2/z8f/f4=; b=IVa/u2m8o8HEV7u+M56fLgIOaLRrSmZp36Mv6eYEw080XkDx8w3/dtzD2zjvu4G5ep kwBiJwgq7Bn7s3yvdE4XYtWDLiPL1prEpmshN+HWtT4ZSAgFQRiDfPV5WmpxWvxL/Q/N U6iCKFXhQFlyO6i1BLc99Dbq8vjT/uz/HTLVOoclmIZ/clBkJiRA13tqYlX3edCmJ3qg ELvn6BCDS8H+rI9vdz4KKPmCgQ2WYPk9bugYFByusbthqedaCe1dGMCwiMA5MCA6AV9+ t1Ux5m2d7rR3dU3EL0hfqTknR6tKUFVqaF3lyMCmjFXGAD+fPId3AdQSCE1/Sg81NFIH zYkw== 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 s15si792624eji.1.2022.01.25.04.39.19 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 25 Jan 2022 04:39:19 -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 20PCdFml019254 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 25 Jan 2022 13:39:19 +0100 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v4 11/12] dpkg-base: Cleanup from buildchroot parts. Date: Tue, 25 Jan 2022 13:39:14 +0100 Message-Id: <20220125123915.1053-12-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220125123915.1053-1-ubely@ilbers.de> References: <20220125123915.1053-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: dq5XDpJB2msC This removes remaining buildchroot-related tasks and variables from dpkg-base class while there are not used anymore. Signed-off-by: Uladzimir Bely --- meta/classes/dpkg-base.bbclass | 19 +++---------------- meta/classes/dpkg.bbclass | 4 ---- 2 files changed, 3 insertions(+), 20 deletions(-) diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass index ea914cd4..513d5217 100644 --- a/meta/classes/dpkg-base.bbclass +++ b/meta/classes/dpkg-base.bbclass @@ -167,6 +167,7 @@ addtask prepare_build after do_patch do_transform_template before do_dpkg_build # If Isar recipes depend on each other, they typically need the package # deployed to isar-apt do_prepare_build[deptask] = "do_deploy_deb" +do_prepare_build[depends] = "${SCHROOT_DEP}" BUILDROOT = "${BUILDCHROOT_DIR}/${PP}" @@ -216,14 +217,11 @@ dpkg_runbuild() { } python do_dpkg_build() { - lock = bb.utils.lockfile(d.getVar("REPO_ISAR_DIR") + "/isar.lock", - shared=True) - bb.build.exec_func("dpkg_do_mounts", d) + bb.build.exec_func('schroot_create_configs', d) try: bb.build.exec_func("dpkg_runbuild", d) finally: - bb.build.exec_func("dpkg_undo_mounts", d) - bb.utils.unlockfile(lock) + bb.build.exec_func('schroot_delete_configs', d) } addtask dpkg_build @@ -257,8 +255,6 @@ do_dpkg_build_setscene[dirs] += "${S}/.." do_dpkg_build[depends] = "${SCHROOT_DEP}" -KEEP_INSTALLED_ON_CLEAN ?= "0" - CLEANFUNCS += "deb_clean" deb_clean() { @@ -267,15 +263,6 @@ deb_clean() { for d in ${DEBS}; do repo_del_package "${REPO_ISAR_DIR}"/"${DISTRO}" \ "${REPO_ISAR_DB_DIR}"/"${DISTRO}" "${DEBDISTRONAME}" "${d}" - if [ "${KEEP_INSTALLED_ON_CLEAN}" = "1" ]; then - continue; - fi - package=$(basename "${d}") - package_remove="/usr/bin/apt-get remove -y ${package%%_*}" - sudo -E chroot ${BUILDCHROOT_DIR} ${package_remove} || true - if [ "${BUILDCHROOT_DIR}" != "${BUILDCHROOT_TARGET_DIR}" ]; then - sudo -E chroot ${BUILDCHROOT_TARGET_DIR} ${package_remove} || true - fi done fi } diff --git a/meta/classes/dpkg.bbclass b/meta/classes/dpkg.bbclass index 38845a16..99d1a074 100644 --- a/meta/classes/dpkg.bbclass +++ b/meta/classes/dpkg.bbclass @@ -13,8 +13,6 @@ dpkg_runbuild() { E="${@ isar_export_ccache(d)}" dpkg_build_export PARALLEL_MAKE "${PARALLEL_MAKE}" - schroot_create_configs - distro="${DISTRO}" if [ ${ISAR_CROSS_COMPILE} -eq 1 ]; then distro="${HOST_DISTRO}" @@ -52,6 +50,4 @@ dpkg_runbuild() { --build-dir=${WORKDIR} ${WORKDIR}/${PPS} deb_dl_dir_export "${WORKDIR}/rootfs" "${distro}" - - schroot_delete_configs } -- 2.20.1