From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7032253102499561472 X-Received: by 2002:a17:907:94c2:: with SMTP id dn2mr7326302ejc.312.1637324022330; Fri, 19 Nov 2021 04:13:42 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:907:c0a:: with SMTP id ga10ls1276165ejc.9.gmail; Fri, 19 Nov 2021 04:13:41 -0800 (PST) X-Google-Smtp-Source: ABdhPJyyfD1F8d8MLUcb/BWmZZDZLqk8apWF0eWDOTkeIivOeFmBXYEmxJ0msjW/7sqC5R39vgyx X-Received: by 2002:a17:907:3da3:: with SMTP id he35mr7142690ejc.464.1637324021333; Fri, 19 Nov 2021 04:13:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1637324021; cv=none; d=google.com; s=arc-20160816; b=us9Lm4tGz9WaMVdCbaZjWsYd/E6+5mrBXUom2TnxSaq/aJgfckGEAiK7DhIso9+m/Z o49J+J6DlHot/WGBJPnndhHSMGSsC5/3Y3EV/TP0bpR0Ucl5OCf+5FGhomdEo9RpB6DL a2C2WAgBnpmh7jy/Grl1vE4u94HF2/R7yArgfPzMhyagTnLhhuqmyf/dfuEyV37e5ypC 4lIcL3/AJIhhoyDL563DbYhAkmOvgSQRMnF3Y9kwt3QYt8CH94ca0tmqGxeaSdPUjjbC jpl/cmwSOL0JxtgzeLBvObm9+GxFR568RVHOV4AJJO7INGIRVNQZjIFLIdCiFYAuL9yp 4MpQ== 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=PuiirULyZFRovL6eQtLRLLJ4I4V+opgGaRnwGfDyc7Q=; b=R0iaCc+wGcVX9ukqSLOvTeMBZa6ste+fngB2OYMkqqe7dK6pQX4CczgJEPLHuI+Zml miYggY6HT3Ft3YoKm21LH/BLqDDh5+FcoT/MvCJq2my3TbpRhwNl/MJZMx715Pl1PnJS jS8fdQQ/3woPCzGoIToGphyi4Slb/cSrE5V2FsKZEh6/I2pXGRFMpTpY1/BAKC6WAZEt +4hwUkJG3hN6VTz2YGZlplNcjZp/fruzZjuUQz2SoKVMc1zGQJYWHDQRc5eeQuOslPJ5 NMbfs6424diSkEe+DjOOO9No5iXPy2xCa23D3qDpErCX0olK71itBBW+Z9nQuFtTTjmy BZRA== 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 bi21si209958edb.0.2021.11.19.04.13.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 19 Nov 2021 04:13:41 -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 1AJCDX7V021829 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 19 Nov 2021 13:13:40 +0100 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v2 21/24] dpkg-base: Cleanup from buildchroot parts. Date: Fri, 19 Nov 2021 13:13:30 +0100 Message-Id: <20211119121333.13805-22-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20211119121333.13805-1-ubely@ilbers.de> References: <20211119121333.13805-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: QloVRNzS8/x3 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 | 43 +++------------------------------- meta/classes/dpkg.bbclass | 4 ---- 2 files changed, 3 insertions(+), 44 deletions(-) diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass index f530df58..d01ef5e8 100644 --- a/meta/classes/dpkg-base.bbclass +++ b/meta/classes/dpkg-base.bbclass @@ -5,7 +5,6 @@ # SPDX-License-Identifier: MIT inherit sbuild -inherit buildchroot inherit debianize inherit terminal inherit repository @@ -163,29 +162,7 @@ addtask prepare_build after do_patch do_transform_template before do_dpkg_build # deployed to isar-apt do_prepare_build[deptask] = "do_deploy_deb" -BUILDROOT = "${BUILDCHROOT_DIR}/${PP}" - -dpkg_do_mounts() { - mkdir -p ${BUILDROOT} - sudo mount --bind ${WORKDIR} ${BUILDROOT} - - buildchroot_do_mounts -} - -dpkg_undo_mounts() { - i=0 - while ! sudo umount ${BUILDROOT}; do - sleep 0.1 - if [ `expr $i % 100` -eq 0 ] ; then - bbwarn "${BUILDROOT}: Couldn't unmount ($i), retrying..." - fi - if [ $i -ge 10000 ]; then - bbfatal "${BUILDROOT}: Couldn't unmount after timeout" - fi - i=`expr $i + 1` - done - sudo rmdir ${BUILDROOT} -} +do_prepare_build[depends] = "${SCHROOT_DEP}" # Placeholder for actual dpkg_runbuild() implementation dpkg_runbuild() { @@ -193,22 +170,17 @@ 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 before do_build do_dpkg_build[depends] = "${SCHROOT_DEP}" -KEEP_INSTALLED_ON_CLEAN ?= "0" - CLEANFUNCS += "deb_clean" deb_clean() { @@ -217,15 +189,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 d80deeab..355da541 100644 --- a/meta/classes/dpkg.bbclass +++ b/meta/classes/dpkg.bbclass @@ -12,8 +12,6 @@ dpkg_runbuild() { E="${@ isar_export_proxies(d)}" export PARALLEL_MAKE="${PARALLEL_MAKE}" - schroot_create_configs - distro="${DISTRO}" if [ ${ISAR_CROSS_COMPILE} -eq 1 ]; then distro="${HOST_DISTRO}" @@ -39,6 +37,4 @@ dpkg_runbuild() { --build-dir=${WORKDIR} ${WORKDIR}/${PPS} deb_dl_dir_export "${WORKDIR}/rootfs" "${distro}" - - schroot_delete_configs } -- 2.20.1