From 79e97dd3fe5fa2e710ca48dd864fd3df1bdb5a3c Mon Sep 17 00:00:00 2001 From: "Roberto A. Foglietta" Date: Mon, 2 Jan 2023 14:46:21 +0100 Subject: [PATCH] dpkg base class: use schroot only not buildchroot anymore The patchset v.2 by Anton Mikanovich to migrate buildchroot to schroot is not complete because the buildchroot is still used by the dpkg base class which can be freed by buildchroot with this patch which applies on the top of these four: * events: Cleanup lost schroot sessions if any, v2 * imager: Move image types to schroot, v2 * imager: Migrate from buildchroot to schroot, v2 * sbuild: Allow setting custom config paths, v2 Signed-off-by: Roberto A. Foglietta --- meta/classes/dpkg-base.bbclass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass index 260aa73..b0035f5 100644 --- a/meta/classes/dpkg-base.bbclass +++ b/meta/classes/dpkg-base.bbclass @@ -5,7 +5,7 @@ # SPDX-License-Identifier: MIT inherit sbuild -inherit buildchroot +#inherit buildchroot inherit debianize inherit terminal inherit repository @@ -124,7 +124,7 @@ addtask apt_fetch do_apt_fetch[lockfiles] += "${REPO_ISAR_DIR}/isar.lock" # Add dependency from the correct buildchroot: host or target -do_apt_fetch[depends] += "${BUILDCHROOT_DEP}" +#do_apt_fetch[depends] += "${BUILDCHROOT_DEP}" # Add dependency from the correct schroot: host or target do_apt_fetch[depends] += "${SCHROOT_DEP}" @@ -194,7 +194,7 @@ dpkg_do_mounts() { mkdir -p ${BUILDROOT} sudo mount --bind ${WORKDIR} ${BUILDROOT} - buildchroot_do_mounts +# buildchroot_do_mounts } dpkg_undo_mounts() { -- 2.34.1