From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7032253102499561472 X-Received: by 2002:a1c:7d0f:: with SMTP id y15mr16290409wmc.191.1638968752424; Wed, 08 Dec 2021 05:05:52 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a5d:4092:: with SMTP id o18ls1391394wrp.1.gmail; Wed, 08 Dec 2021 05:05:51 -0800 (PST) X-Google-Smtp-Source: ABdhPJziOVn35raoJbFWIr7+mbckskWqrFrKQD+l+vuQc1eYPOVp5kstXKxeU7r2oa7mjimtsKNP X-Received: by 2002:a5d:614f:: with SMTP id y15mr59053128wrt.587.1638968751426; Wed, 08 Dec 2021 05:05:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1638968751; cv=none; d=google.com; s=arc-20160816; b=cSzYtWoCBjFcQQRGxDuEvDi1+B2XKXbT78Dx2iodZncI+1jf8LrCh4gyrcPyTTJowj WpvsCoIpeQjJc51PL9+llFCx6BxOtjXonbtWhiMIg5QQfUSBSyGMHKx+Pjf2X1idjp0H r6jRZtQDTXsByiH8JIT9v+8nYREDEO6qPpJ0/BuS7B3tWuO/2JBnW/ubLBMUBIr6h8wo lkze91z9VQHwubLVdhwieOxeXqSf6mLheUiXnng7tVVllB1t92cwSnk+DCC9PkkahAnc YdxEdPtgXxzjnOWjoHLsvHhUz94L6BQSJvNO3I1U6K6z2brlQ29c2a44S5aFjvEIhbuT 5lAw== 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=FBzXxI9qhWczYAonkDoqUVGNFpa7kODND0RMz0tHPNY=; b=0oj+9NqIVswywknMe4iS+teF+OROZgjqN29fMaSn451kIsyI/T85BUidDwQR+TtUJ8 d9RtRZp/oW0u4qwoN4QOn2vrSPWo4SwuarMdrQomvtFbKR4ilb4c9Fp8sQ20Wdwtebh/ afM1BRksgXHkcRk7w4eVkDdKX3cYdebDu6lwZyphFADraK3p1XvH3/sf+8s3fmAnkNv+ 1Mi39U3geb8TW7vNMQyzLkLYYWGHGmkzkGj+6/B3X+zlq/LoCz4mPPSm3X9fM1htoSMC POeFDwL1Q/lSbnMd5gDIdKn4tTyk5ue7hsi5k1oBIf2VfodPGsav9OZ6doEs9OSdsdu7 XLGQ== 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 q74si468592wme.0.2021.12.08.05.05.51 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 08 Dec 2021 05:05:51 -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 1B8D5iLJ009193 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 8 Dec 2021 14:05:50 +0100 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v3 18/20] dpkg-base: Cleanup from buildchroot parts. Date: Wed, 8 Dec 2021 14:05:42 +0100 Message-Id: <20211208130544.15133-19-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20211208130544.15133-1-ubely@ilbers.de> References: <20211208130544.15133-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: viDNRfU+/6Tc 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 f10f424f..e7acace6 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 @@ -165,29 +164,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}" do_prepare_build_append() { # Make a local copy of isar-apt repo that is not affected by other parallel builds @@ -203,14 +180,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 @@ -242,8 +216,6 @@ do_dpkg_build_setscene[dirs] += "${S}/.." do_dpkg_build[depends] = "${SCHROOT_DEP}" -KEEP_INSTALLED_ON_CLEAN ?= "0" - CLEANFUNCS += "deb_clean" deb_clean() { @@ -252,15 +224,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 fe5a6011..85bb1300 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}" @@ -40,6 +38,4 @@ dpkg_runbuild() { --build-dir=${WORKDIR} ${WORKDIR}/${PPS} deb_dl_dir_export "${WORKDIR}/rootfs" "${distro}" - - schroot_delete_configs } -- 2.20.1