From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7183020631148986368 X-Received: by 2002:ab0:3a8d:0:b0:419:678:cf31 with SMTP id r13-20020ab03a8d000000b004190678cf31mr2973662uaw.63.1672427319194; Fri, 30 Dec 2022 11:08:39 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6102:23cc:b0:3b1:1703:92cb with SMTP id x12-20020a05610223cc00b003b1170392cbls5848867vsr.1.-pod-prod-gmail; Fri, 30 Dec 2022 11:08:38 -0800 (PST) X-Google-Smtp-Source: AMrXdXshifFTUX3CjeVdi/CZVf0D8ZqKUBDq0zYnGkzfcyNisbBa+vs7Awaxn7tYG9IyAOg+Iqc2 X-Received: by 2002:a05:6102:240f:b0:3c5:674d:ed65 with SMTP id j15-20020a056102240f00b003c5674ded65mr9571922vsi.33.1672427318625; Fri, 30 Dec 2022 11:08:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672427318; cv=none; d=google.com; s=arc-20160816; b=ew1LlPHmFynsO7oJcI4LeAyBWI3tTku7PRJnvTs/kXhyr7pXubiTz7vjhgr27QyTN5 7WEFBsSpVKKxLFKAkDlgVXCBh8/A8yX9hRV+hwFxGg8JvxqwA82dtFWxFgDKN/rpIX4w /rC5AYOACk37Ia1i1NUjfnLGOrAsgeGkj9NexOhCKiMvAjK0jViWfXCnfaAkfHuPEZNX W6eoD6tx4seznVUx9mqbmox3YlS63tfnuM/Xh8kgdTrFPokNAHG1SW722b1KmtZtHID8 zNGvXtB049T9hwJRaGrcFjicmzNHz2/i4OyjgJO5PaZyCoy4+DSSDSglpAEqjbI4OkA5 Z3pg== 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=IXMgIztalGcCYDUZGjkVIUvjI299qSmI4KAQiDApyOU=; b=iD1kXz7dm4NS0LGeEdENE1NZaCMzl9B+bJwgivqGueItGPvqnVm3R0frpR7Dv2xlvG KAQuFe+t8BBedjVVXGtoBV1kpNG8s1ar5rkplWjkYXU09+SwLozOS9LhE7CodLhqmf3Q qWyUEo7ziXV5HzwFIafyu5J/YhiOI6OWScP41SZR1PR5rqvW0N6+4X6lylgp9EeX6Wef 9Mo9M5JWEjA8ai+rgp1JFtLNVBengjyXtD40kjvsYi9IKruscApD8JAebC0m4fUIy41r TLAf3mn3nPDqaxdSf0JCj6+/xvpVN9ML+qNnkwOalZD0lJSZzbDRVGs2tNsxa30cy4/3 0vUQ== 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 az33-20020a05613003a100b0054bf671c8ccsi604471uab.0.2022.12.30.11.08.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 30 Dec 2022 11:08:38 -0800 (PST) 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 alena-nb.promwad.com ([194.49.52.150]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 2BUJ8WNE014232 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 30 Dec 2022 20:08:36 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v2 2/4] imager: Migrate from buildchroot to schroot Date: Fri, 30 Dec 2022 22:08:22 +0300 Message-Id: <20221230190824.12256-3-amikan@ilbers.de> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20221230190824.12256-1-amikan@ilbers.de> References: <20221230190824.12256-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: EXVDDdiMZaTD Install dependencies and perform all imager actions using one schroot overlay. This requires to open a session which stays opened until all the images are ready. This session will be closed then and all the changes will be lost. Signed-off-by: Anton Mikanovich --- meta/classes/image-tools-extension.bbclass | 80 +++++++++++++++++++--- meta/classes/image.bbclass | 1 + 2 files changed, 72 insertions(+), 9 deletions(-) diff --git a/meta/classes/image-tools-extension.bbclass b/meta/classes/image-tools-extension.bbclass index 2d3dda4f..85f0d551 100644 --- a/meta/classes/image-tools-extension.bbclass +++ b/meta/classes/image-tools-extension.bbclass @@ -5,13 +5,15 @@ # # This file extends the image.bbclass to supply tools for futher imager functions -inherit buildchroot +inherit sbuild IMAGER_INSTALL ??= "" IMAGER_BUILD_DEPS ??= "" DEPENDS += "${IMAGER_BUILD_DEPS}" -do_install_imager_deps[depends] = "${BUILDCHROOT_DEP} isar-apt:do_cache_config" +IMAGER_SCHROOT_SESSION_ID = "isar-imager-${SCHROOT_USER}-${PN}-${MACHINE}-${ISAR_BUILD_UUID}" + +do_install_imager_deps[depends] = "${SCHROOT_DEP} isar-apt:do_cache_config" do_install_imager_deps[deptask] = "do_deploy_deb" do_install_imager_deps[lockfiles] += "${REPO_ISAR_DIR}/isar.lock" do_install_imager_deps[network] = "${TASK_USE_NETWORK_AND_SUDO}" @@ -25,11 +27,9 @@ do_install_imager_deps() { distro="${HOST_BASE_DISTRO}-${BASE_DISTRO_CODENAME}" fi - buildchroot_do_mounts - E="${@ isar_export_proxies(d)}" - deb_dl_dir_import ${BUILDCHROOT_DIR} ${distro} - sudo -E chroot ${BUILDCHROOT_DIR} sh -c ' \ + deb_dl_dir_import ${SCHROOT_DIR} ${distro} + schroot -r -c ${IMAGER_SCHROOT_SESSION_ID} -d / -u root -- sh -c ' \ apt-get update \ -o Dir::Etc::SourceList="sources.list.d/isar-apt.list" \ -o Dir::Etc::SourceParts="-" \ @@ -38,10 +38,72 @@ do_install_imager_deps() { --allow-unauthenticated --allow-downgrades --download-only install \ ${IMAGER_INSTALL}' - deb_dl_dir_export ${BUILDCHROOT_DIR} ${distro} - sudo -E chroot ${BUILDCHROOT_DIR} sh -c ' \ + deb_dl_dir_export ${SCHROOT_DIR} ${distro} + schroot -r -c ${IMAGER_SCHROOT_SESSION_ID} -d / -u root -- sh -c ' \ apt-get -o Debug::pkgProblemResolver=yes --no-install-recommends -y \ --allow-unauthenticated --allow-downgrades install \ ${IMAGER_INSTALL}' } -addtask install_imager_deps before do_image_tools +addtask install_imager_deps before do_image_tools after do_start_imager_session + +SCHROOT_MOUNTS = "${WORKDIR}:${PP_WORK} ${IMAGE_ROOTFS}:${PP_ROOTFS} ${DEPLOY_DIR_IMAGE}:${PP_DEPLOY}" + +do_start_imager_session[dirs] = "${WORKDIR} ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}" +do_start_imager_session[depends] = "${SCHROOT_DEP} isar-apt:do_cache_config" +do_start_imager_session[nostamp] = "1" +do_start_imager_session[network] = "${TASK_USE_SUDO}" +python do_start_imager_session() { + import subprocess + bb.build.exec_func("schroot_create_configs", d) + bb.build.exec_func("insert_mounts", d) + sbuild_chroot = d.getVar("SBUILD_CHROOT", True) + session_id = d.getVar("IMAGER_SCHROOT_SESSION_ID", True) + try: + if subprocess.run("schroot -l --all-sessions | grep %s" % session_id, shell=True).returncode: + subprocess.run("schroot -b -c %s -n %s" % (sbuild_chroot, session_id), shell=True, check=True) + bb.debug(2, "Open schroot session %s" % session_id) + else: + subprocess.run("schroot --recover-session -c %s" % session_id, shell=True, check=True) + bb.debug(2, "Reuse schroot session %s" % session_id) + d.setVar("SCHROOT_OPEN_SESSION_ID", session_id) + except subprocess.CalledProcessError as err: + subprocess.run("schroot -e -c %s" % session_id, shell=True) + bb.build.exec_func("remove_mounts", d) + bb.build.exec_func("schroot_delete_configs", d) + bb.fatal("Could not create schroot session: %s" % err.output.decode('utf-8') if err.output else "") +} +addtask start_imager_session before do_stop_imager_session after do_rootfs_finalize + +do_stop_imager_session[depends] = "${SCHROOT_DEP}" +do_stop_imager_session[nostamp] = "1" +do_stop_imager_session[network] = "${TASK_USE_SUDO}" +python do_stop_imager_session() { + import subprocess + session_id = d.getVar("IMAGER_SCHROOT_SESSION_ID", True) + try: + id = subprocess.run("schroot -d / -r -c %s -- printenv -0 SCHROOT_ALIAS_NAME" % session_id, + shell=True, check=True, stdout=subprocess.PIPE).stdout.decode('utf-8') + bb.debug(2, "Close schroot session %s (%s)" % (session_id, id)) + subprocess.run("schroot -e -c %s" % session_id, shell=True, check=True) + except subprocess.CalledProcessError as err: + bb.error("Could not close schroot session %s: %s" % (session_id, err.output.decode('utf-8')) if err.output else "") + finally: + if 'id' in locals(): + d.setVar("SBUILD_CHROOT", id) + bb.build.exec_func("remove_mounts", d) + bb.build.exec_func("schroot_delete_configs", d) +} +addtask stop_imager_session before do_deploy after do_image + +imager_run() { + imager_cleanup() { + if id="$(schroot -d / -r -c ${IMAGER_SCHROOT_SESSION_ID} -- printenv -0 SCHROOT_ALIAS_NAME)"; then + schroot -e -c ${IMAGER_SCHROOT_SESSION_ID} + remove_mounts $id + schroot_delete_configs $id + fi + } + trap 'exit 1' INT HUP QUIT TERM ALRM USR1 + trap 'imager_cleanup' EXIT + schroot -r -c ${IMAGER_SCHROOT_SESSION_ID} "$@" +} diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index ba0fd6ef..5851b94d 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -296,6 +296,7 @@ python() { d.appendVarFlag(task, 'vardeps', ' ' + ' '.join(vardeps)) d.appendVarFlag(task, 'vardepsexclude', ' ' + ' '.join(vardepsexclude)) d.appendVarFlag(task, 'dirs', localdata.expand(' ${DEPLOY_DIR_IMAGE}')) + d.appendVarFlag(task, 'deptask', ' do_start_imager_session') if task_deps: d.appendVarFlag(task, 'depends', task_deps) bb.build.addtask(task, 'do_image', after, d) -- 2.17.1