From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7097485294514995200 X-Received: by 2002:a05:6512:321c:b0:46b:b7fd:1eca with SMTP id d28-20020a056512321c00b0046bb7fd1ecamr6063919lfe.481.1652512072774; Sat, 14 May 2022 00:07:52 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:651c:198d:b0:24f:4fa4:38da with SMTP id bx13-20020a05651c198d00b0024f4fa438dals1856454ljb.4.gmail; Sat, 14 May 2022 00:07:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxZBix0jLy3a/ENNk6FWCPLv6lYaupfYzbMRRnPilJa/AjaGDU6rIQRCgTPFe49NGRVRyWn X-Received: by 2002:a2e:9c41:0:b0:24f:1074:79c1 with SMTP id t1-20020a2e9c41000000b0024f107479c1mr5069854ljj.474.1652512071681; Sat, 14 May 2022 00:07:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1652512071; cv=none; d=google.com; s=arc-20160816; b=QtgGI6n1amSYjOXF1N/xHotXp0ds0vTLGVUlmURvgFU8AOOJbaHrxSRqhddF1yyJJ6 4qHIY/kjvfVk3W9ExubjbRh30Bo1Fxze7xtkDb2lVNiYlTASEcuBr5QqrV9nMMe/fOyP kO/Cj5Z3q8pS/Wd4zBEfRwOXdQmImafbGeNdz93EbNagxsmqrFAbdScL6C7cfqN252d2 ioHLFI/Vr+VSaoEs5o9X+AMnMT9dYgBHCjcs5GAr/uQnmUMwULZa5bPsiq1LZyLgOLva JO2cwv2sVMbN50QrIkS3ruYzuAVkBKBntLrpnwqtKcACtSfx0Na3wsS1Boc+U5hNlRra MDyA== 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=QWg7AHdW9CD+dKzeDzknBAn8Zb5kFr8y+r8uAV96Kns=; b=0KC4mR+GaVmypE874uTEFfBwmzfpFPZvzEQjJ6zZ3O3nFxhOMuMnst4bFDsCoO60Zg aaQttBrVFGGNbX8TVIKaZobSJn8TKBi9zQCURQ6N0kMqVj2MG997VhuqZBNDJo0seiax KgufmLhfC1YwC04HGxzTnmloG+IIPpL4W5PmI8R4SMW2auYGeeBcFSIZprAp8XBiCCxy ETsjEym2IcoDZSFVdJn2zzB9ajdlimuozVaHGwMvGqnmDDo/3oUQZCrk13jXXQPwj65J mljfYpMwplvIuoCMzmrWKT8pYvishPGPe/7F0zGy5BYjZMll/o9GbsGHBbyiHM2stA3G Qn5Q== 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 c5-20020a2e9d85000000b002499fdca3e4si272104ljj.3.2022.05.14.00.07.51 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 14 May 2022 00:07:51 -0700 (PDT) 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 localhost.localdomain (mm-235-31-214-37.mgts.dynamic.pppoe.byfly.by [37.214.31.235] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 24E77k09025368 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sat, 14 May 2022 09:07:50 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: adriaan.schmidt@siemens.com, Anton Mikanovich Subject: [PATCH 3/6] imager: Migrate from buildchroot to schroot Date: Sat, 14 May 2022 10:07:33 +0300 Message-Id: <20220514070736.12997-4-amikan@ilbers.de> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220514070736.12997-1-amikan@ilbers.de> References: <20220514070736.12997-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: /GopSBZDrNxk 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, 71 insertions(+), 10 deletions(-) diff --git a/meta/classes/image-tools-extension.bbclass b/meta/classes/image-tools-extension.bbclass index b996813..54a6622 100644 --- a/meta/classes/image-tools-extension.bbclass +++ b/meta/classes/image-tools-extension.bbclass @@ -5,16 +5,18 @@ # # This file extends the image.bbclass to supply tools for futher imager functions -# Imager are expected to run natively, thus will use the target buildchroot. +# Imager are expected to run natively, thus will use the target schroot. ISAR_CROSS_COMPILE = "0" -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}-${BITBAKE_BUILD_ID}" + +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() { @@ -22,11 +24,9 @@ do_install_imager_deps() { exit 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="-" \ @@ -35,10 +35,70 @@ 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" +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" +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 26b1b0d..651b252 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -275,6 +275,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