From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6989231260094693376 X-Received: by 2002:a05:6512:34d0:: with SMTP id w16mr12790759lfr.293.1627307225330; Mon, 26 Jul 2021 06:47:05 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:b171:: with SMTP id a17ls2699601ljm.4.gmail; Mon, 26 Jul 2021 06:47:04 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzo0KAFvikDoJwsjCQzbEr/n/bTbMVr9AuxgAefKfos2gpXAZUsvLt0wKUv6lNwY/0+Zgv4 X-Received: by 2002:a2e:8157:: with SMTP id t23mr4812695ljg.311.1627307224267; Mon, 26 Jul 2021 06:47:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627307224; cv=none; d=google.com; s=arc-20160816; b=MHcY/hkB6dCA4pdcwl8cP956LBO6wy5GmPeBge3FJCuqZ6Wqklt5+FbtUzqzAwDzd5 mqPE5pPnlpEuejPqTKNmIKjNl5cWghU1h3r+/Cza9fVtB5+LmzLVdJFUNpnUAgzk2wfr 2bNdd6sYySbrX3aAKNMKdG8/1H6YAktvDQ5hmTHkb5D6losvPspIuv8nAyDKY5xfl4pd 59m+0pDRtymGN0KlO6qXUAKjhHIyAe/tlVo3qMIZu/t25Mgc0EoHilcogkGHYrZBRkxd giklwDFlRpygMoTSK+KwVMEA+O8BoefU6YQjGM95rpr0sqROGLJhjbNdX8jYa8Sx9zH+ 0mhw== 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:cc:to:from; bh=7/f8s9kIv4XPB2jjbe9DVnNvngTc6AttmgmwJFhd7u8=; b=PLPT46+Ep7ik2tn0y4ncL/r0hdBu0n4codnIog3NhOrVxaorgE4FdJqTnSM7Fxm5BO ol/zPLB23hGsg8kZ80niP4U64i7LUHfMudn8egERoYiAxqFLKommuocfKHAHNjYwgcoF 2MpnqrobXDhZf6PwzzDb3O7zngwZ24bNZYagdZjKyWGDU9Untmp1QR40S37gKnMtHqzF amgiiKMLLUUi/pukLkLCFYrOyrQNxP115EU7JcfFtltqllEYhgaVMP2OLup81kE6eZyz PDG8gA0iRaci0peSwO1R2nyUg8eCcYiFKdChdj+ibaZbofE6hmuR6sxuUQwwURlufYXT JDvw== 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 q4si981444lji.2.2021.07.26.06.47.04 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 26 Jul 2021 06:47:04 -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-198-62-214-37.mgts.dynamic.pppoe.byfly.by [37.214.62.198] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 16QDknv5019679 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 26 Jul 2021 15:47:03 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [RFC 13/15] img: Use schroot for image prepare Date: Mon, 26 Jul 2021 16:46:34 +0300 Message-Id: <20210726134636.30800-14-amikan@ilbers.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210726134636.30800-1-amikan@ilbers.de> References: <20210726134636.30800-1-amikan@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: yG6rJQKoYQKt Perform all image generation functions inside schroot. Signed-off-by: Anton Mikanovich --- meta/classes/ext4-img.bbclass | 8 ++------ meta/classes/fit-img.bbclass | 11 ++++------- meta/classes/image-tools-extension.bbclass | 14 ++++---------- meta/classes/image.bbclass | 19 ++----------------- meta/classes/ubi-img.bbclass | 11 ++++------- meta/classes/ubifs-img.bbclass | 11 ++++------- 6 files changed, 20 insertions(+), 54 deletions(-) diff --git a/meta/classes/ext4-img.bbclass b/meta/classes/ext4-img.bbclass index 26e0137..6f89fce 100644 --- a/meta/classes/ext4-img.bbclass +++ b/meta/classes/ext4-img.bbclass @@ -13,12 +13,8 @@ do_ext4_image() { truncate -s ${ROOTFS_SIZE}K '${DEPLOY_DIR_IMAGE}/${EXT4_IMAGE_FILE}' - image_do_mounts - - sudo chroot ${BUILDCHROOT_DIR} /sbin/mke2fs ${MKE2FS_ARGS} \ - -F -d '${PP_ROOTFS}' '${PP_DEPLOY}/${EXT4_IMAGE_FILE}' - - image_undo_mounts + schroot_run -d ${PP_WORK} -c ${SBUILD_CHROOT} -u root -- /sbin/mke2fs \ + ${MKE2FS_ARGS} -F -d '${PP_ROOTFS}' '${PP_DEPLOY}/${EXT4_IMAGE_FILE}' } addtask ext4_image before do_image after do_image_tools diff --git a/meta/classes/fit-img.bbclass b/meta/classes/fit-img.bbclass index da8e1da..483ef66 100644 --- a/meta/classes/fit-img.bbclass +++ b/meta/classes/fit-img.bbclass @@ -18,12 +18,9 @@ do_fit_image() { rm -f '${DEPLOY_DIR_IMAGE}/${FIT_IMAGE_FILE}' - image_do_mounts - - # Create fit image using buildchroot tools - sudo chroot ${BUILDCHROOT_DIR} /usr/bin/mkimage ${MKIMAGE_ARGS} \ - -f '${PP_WORK}/${FIT_IMAGE_SOURCE}' '${PP_DEPLOY}/${FIT_IMAGE_FILE}' - - image_undo_mounts + # Create fit image using schroot tools + schroot_run -d ${PP_WORK} -c ${SBUILD_CHROOT} -- \ + /usr/bin/mkimage ${MKIMAGE_ARGS} -f '${PP_WORK}/${FIT_IMAGE_SOURCE}' \ + '${PP_DEPLOY}/${FIT_IMAGE_FILE}' } addtask fit_image before do_image after do_image_tools do_transform_template diff --git a/meta/classes/image-tools-extension.bbclass b/meta/classes/image-tools-extension.bbclass index 4738479..7896695 100644 --- a/meta/classes/image-tools-extension.bbclass +++ b/meta/classes/image-tools-extension.bbclass @@ -8,8 +8,6 @@ # Imager are expected to run natively, thus will use the target buildchroot. ISAR_CROSS_COMPILE = "0" -inherit buildchroot - IMAGER_INSTALL ??= "" IMAGER_BUILD_DEPS ??= "" DEPENDS += "${IMAGER_BUILD_DEPS}" @@ -22,11 +20,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 ' \ + #TODO deb_dl_dir_import ${BUILDCHROOT_DIR} ${DISTRO} + schroot -d / -c ${SBUILD_CHROOT_RW} -u root -- sh -c ' \ apt-get update \ -o Dir::Etc::SourceList="sources.list.d/isar-apt.list" \ -o Dir::Etc::SourceParts="-" \ @@ -35,12 +31,10 @@ 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 ' \ + #TODO deb_dl_dir_export ${BUILDCHROOT_DIR} ${DISTRO} + schroot -d / -c ${SBUILD_CHROOT_RW} -u root -- sh -c ' \ apt-get -o Debug::pkgProblemResolver=yes --no-install-recommends -y \ --allow-unauthenticated --allow-downgrades install \ ${IMAGER_INSTALL}' - - buildchroot_undo_mounts } addtask install_imager_deps before do_image_tools diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 12d1616..9ca484a 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -52,24 +52,9 @@ DEPENDS += "${IMAGE_INSTALL}" ISAR_RELEASE_CMD_DEFAULT = "git -C ${LAYERDIR_core} describe --tags --dirty --match 'v[0-9].[0-9]*'" ISAR_RELEASE_CMD ?= "${ISAR_RELEASE_CMD_DEFAULT}" -image_do_mounts() { - sudo flock ${MOUNT_LOCKFILE} -c ' \ - mkdir -p "${BUILDROOT_DEPLOY}" "${BUILDROOT_ROOTFS}" "${BUILDROOT_WORK}" - mount --bind "${DEPLOY_DIR_IMAGE}" "${BUILDROOT_DEPLOY}" - mount --bind "${IMAGE_ROOTFS}" "${BUILDROOT_ROOTFS}" - mount --bind "${WORKDIR}" "${BUILDROOT_WORK}" - ' - buildchroot_do_mounts -} +inherit sbuild -image_undo_mounts() { - buildchroot_undo_mounts - sudo flock ${MOUNT_LOCKFILE} -c ' \ - umount "${BUILDROOT_DEPLOY}" - umount "${BUILDROOT_ROOTFS}" - umount "${BUILDROOT_WORK}" - ' -} +SCHROOT_MOUNTS = "${DEPLOY_DIR_IMAGE}:${PP_DEPLOY} ${IMAGE_ROOTFS}:${PP_ROOTFS} ${WORKDIR}:${PP_WORK}" ROOTFSDIR = "${IMAGE_ROOTFS}" ROOTFS_FEATURES += "clean-package-cache generate-manifest export-dpkg-status" diff --git a/meta/classes/ubi-img.bbclass b/meta/classes/ubi-img.bbclass index 0f4c4cb..a753504 100644 --- a/meta/classes/ubi-img.bbclass +++ b/meta/classes/ubi-img.bbclass @@ -21,12 +21,9 @@ do_ubi_image() { rm -f '${DEPLOY_DIR_IMAGE}/${UBI_IMAGE_FILE}' - image_do_mounts - - # Create ubi image using buildchroot tools - sudo chroot ${BUILDCHROOT_DIR} /usr/sbin/ubinize ${UBINIZE_ARGS} \ - -o '${PP_DEPLOY}/${UBI_IMAGE_FILE}' '${PP_WORK}/${UBINIZE_CFG}' - - image_undo_mounts + # Create ubi image using schroot tools + schroot_run -d ${PP_WORK} -c ${SBUILD_CHROOT} -- \ + /usr/sbin/ubinize ${UBINIZE_ARGS} -o '${PP_DEPLOY}/${UBI_IMAGE_FILE}' \ + '${PP_WORK}/${UBINIZE_CFG}' } addtask ubi_image before do_image after do_image_tools do_transform_template diff --git a/meta/classes/ubifs-img.bbclass b/meta/classes/ubifs-img.bbclass index e422b46..13ce667 100644 --- a/meta/classes/ubifs-img.bbclass +++ b/meta/classes/ubifs-img.bbclass @@ -16,13 +16,10 @@ IMAGER_INSTALL += "mtd-utils" do_ubifs_image() { rm -f '${DEPLOY_DIR_IMAGE}/${UBIFS_IMAGE_FILE}' - image_do_mounts - - # Create ubifs image using buildchroot tools - sudo chroot ${BUILDCHROOT_DIR} /usr/sbin/mkfs.ubifs ${MKUBIFS_ARGS} \ - -r '${PP_ROOTFS}' '${PP_DEPLOY}/${UBIFS_IMAGE_FILE}' - - image_undo_mounts + # Create ubifs image using schroot tools + schroot_run -d ${PP_WORK} -c ${SBUILD_CHROOT} -- \ + /usr/sbin/mkfs.ubifs ${MKUBIFS_ARGS} -r '${PP_ROOTFS}' \ + '${PP_DEPLOY}/${UBIFS_IMAGE_FILE}' } addtask ubifs_image before do_image after do_image_tools -- 2.25.1