From patchwork Wed Sep 27 04:33:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Uladzimir Bely X-Patchwork-Id: 3140 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Wed, 27 Sep 2023 06:33:34 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-lf1-f57.google.com (mail-lf1-f57.google.com [209.85.167.57]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 38R4XX2A022038 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 27 Sep 2023 06:33:34 +0200 Received: by mail-lf1-f57.google.com with SMTP id 2adb3069b0e04-5042bc93273sf14525682e87.1 for ; Tue, 26 Sep 2023 21:33:34 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1695789206; cv=pass; d=google.com; s=arc-20160816; b=lKVRSSfs3QdeGhSHvlyfU5ZeOFjRPqnxOL+0P8Mg3r5abARQiPSyyUXTE9uSSofCs8 SVDE3Ngk2gt3MIn05dLVlkD3Qzr1BQy9/aw44PK2Yrif2Fdvnyn7VIi8FZhfa7W5YreS IDfe2vfJgpZIup41A2BWO6rTSIEOVwfiYVqn16WDQ+PrOHnZHsY7dNO5hlKUkQiLaSxG mEAhOTFcaclyQ+6AMBifDMP25XFhMPst7wQmPbtMNRIXcZFM0KjZUHocnw1DzYe18cWz aX+3Q2BzfWxvGuKi+QlPOGYVSFNuGGQIVF5KpBRzTjmsZGEh0zkaNSEWNlZMEWVT6Ast jamA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:to:from:sender:dkim-signature; bh=4sNTeIZr5R0YXU3FqYKRUTNmHH3hTdcMAwANkhJBt+c=; fh=7tclEdh7YbwSQowgJ6LNq720O7H5HTEaqj22NJWRE2E=; b=IuYiKZjRHy6j7IoPWh4A3LvXgOe7GmnaTqTItr/jkVtY5RJ/pLNN3GZskpyDynkzn4 001QddNnF1VTwf1+WgRlqt9sooM+UMdHkZf2pTwaLlUDeLiuCwfaTX/tuA0f2pGumQIa DvwMMETAVHaVzfBgLrTL0VhMmDx1T8aGhMqWPg2qhx0ujhDjJvnNEZ6nbp4KJamLhbMB fBBtumT9j4mFGcNzllnw2VP3cKK1UGBeCz9IPaucAb6Zm3CFKbFdH2KdD84OWDw1lIlB shRaMXoI12cnt8LhZ7TJfJEBUVYFU8Qi9TynIZXfCc4wC9EekiSlVEcB7OPZrg6MCxYj ufJg== ARC-Authentication-Results: i=2; 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1695789206; x=1696394006; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:to:from:sender:from:to:cc:subject:date:message-id :reply-to; bh=4sNTeIZr5R0YXU3FqYKRUTNmHH3hTdcMAwANkhJBt+c=; b=YAD8rdrs0Hlieq8S+NNPRAX5PmJwjBSHi5JniANixFP9Ly8+Ylwr2WDk3/CJO4zKHU XC/gSsR2yuIBQVoUc5mGPU8+KIbqOoqpnzie17HhVY31hGnH82QZ7CGA/+KJN3of4/5y Y8ejPepDBaAWJsMHqSvosbyhCnzx1F5TbxvKE2ifhL3DIU1PDRbRBoAlj0aaQQxMZOwq qbE1nIrWf6tlW7kM9jJeSHP0q8kxa2Ka5Z2HmzmUre4TA3iqxV27LbMDjNArS8g2yEsO wWMMQnmm9UeJPI7YkxxTpbGjZ5jFS2f7844r89lluS8yQkcqxI/XvVo+3iwx5T3CvZFE Z/+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695789206; x=1696394006; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:to:from:x-beenthere :x-gm-message-state:sender:from:to:cc:subject:date:message-id :reply-to; bh=4sNTeIZr5R0YXU3FqYKRUTNmHH3hTdcMAwANkhJBt+c=; b=hemOrx45s+9UKhjNhP/eTOj/gWixk8YxVE+2FxHila0NBH6ojP6FenHSpB5cwCv6P9 eUofL2JUpTbI0ec7a7+TwQnbWaAlBT5TT5Uk3hTHG0BeDNF+W2ffXlqNs5T9mGq4d+wn qIGryhHh0+76RBY2FqpA7/vDbtQr2sajBOlwa2jrv0CKtc4oB37lwSKWOkTyxtNqnIzg nrUbb69POYtuGR+rQjkvm/f0GQ7ZhQbSDQw9llBlf02ECvNy5EhVXgki9Zvba+6b/111 QqJz24W/sLvBbDpITUnuTa30mjohH6/Kzjy7kPhntpvK7CeaC38BrK11aoFDMq8Y5EXA qXKw== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOJu0Yz9v1EzBVdyeALvKMMmh+4yDeFA9403GY6l4mJAk50CZCRy3nGI 9ebzO98OYT0GZDk2s5VuxSw= X-Google-Smtp-Source: AGHT+IGCGiVys66aMZlM/1ZueahWox8TVhIGbPdDUlgAWuPbFOcsW75Djlb1gnlhBnnFdsF8i/IYeg== X-Received: by 2002:a05:6512:114f:b0:500:b14a:cc63 with SMTP id m15-20020a056512114f00b00500b14acc63mr796873lfg.12.1695789205022; Tue, 26 Sep 2023 21:33:25 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ac2:5b87:0:b0:503:c44:8e88 with SMTP id o7-20020ac25b87000000b005030c448e88ls661993lfn.0.-pod-prod-08-eu; Tue, 26 Sep 2023 21:33:23 -0700 (PDT) X-Received: by 2002:a05:6512:3e1c:b0:503:446:c7b1 with SMTP id i28-20020a0565123e1c00b005030446c7b1mr738422lfv.40.1695789203028; Tue, 26 Sep 2023 21:33:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695789203; cv=none; d=google.com; s=arc-20160816; b=QVO639i1IZKiVQ9YlQCzfjMR9n4L08QNnCzgcSMqSaODPBSN+MgQemlaZAfscST5N0 yd5bKCZqSKGlE+hUXG6CtPKR2jRiayduDfvnt8VF4fjkhwnzJOYIyhI/d+evLZ8EbuXC WDN0jmW4DsjNX5ZhSqW1W7/SG6rN7NzOgwo5T60BsrUBfmzYkjDupg8JuCWVPgiJerfJ Nt1X6DP9cLOwEr13DbAMcH5mFDyYpUbJxIpq0JstDQUALbbQK+Nq+XV1Q3kbGfHX+ZqG ELp3iYxfVGVV22qfE3q+R07+nvrvAbMzo18GNVnqnMjPrNvwP8DoHXwblgn+gYk5xh6l oVRA== 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=XmAczAiWW9vGHfmrWdmmjebpZhHR3LrkG40gZQrBoKg=; fh=7tclEdh7YbwSQowgJ6LNq720O7H5HTEaqj22NJWRE2E=; b=g37G2XkGDUetx/m0d4lGI4b0UKSuxohycDYAXYfuC9CY82aVxixjojQVvOOvMCymZ5 d/mHzLcwJ7ovDqx/9N0VSPP0MRwoOODvNxxApFsVxmNJY2PfiB8wcgRbQnvDA6YhT6FH 1EaujdfWAAKN8zMzRuho6XoiAHD9f34quQ7/54EEl1BPKrewNFzkmrHco+UbXoi7J6N9 6kRlrFzwvRVh53toNmwDwdAxJXPU/sPLlTA6infLrAfUcydJoKZzZ4QQSWOnr4X93Lr6 /S64xEJRyJGAmRCdrJSDwyodq42hpWir+rPAD9+VUm42CWc7XYLugAuOA6cHcnp6NZPI PvBA== 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 Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id bx13-20020a0564020b4d00b0052e7b1828cfsi174923edb.5.2023.09.26.21.33.22 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 26 Sep 2023 21:33:22 -0700 (PDT) Received-SPF: pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; 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+deb9u1) with ESMTPSA id 38R4XKXn021959 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 27 Sep 2023 06:33:22 +0200 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v4 3/6] isar-bootstrap: Use tar output instead of directory Date: Wed, 27 Sep 2023 06:33:17 +0200 Message-Id: <20230927043320.6264-4-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20230927043320.6264-1-ubely@ilbers.de> References: <20230927043320.6264-1-ubely@ilbers.de> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_PASS 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-Original-Sender: ubely@ilbers.de X-Original-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 Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= From: Anton Mikanovich Do not unpack tar with rootfs content inside bootstrap recipe. This also requires moving chroot prepare step to the later unpack step. Signed-off-by: Anton Mikanovich --- meta/classes/rootfs.bbclass | 11 +++++---- .../isar-bootstrap/isar-bootstrap.inc | 23 ++++--------------- 2 files changed, 12 insertions(+), 22 deletions(-) diff --git a/meta/classes/rootfs.bbclass b/meta/classes/rootfs.bbclass index 7dec7b36..09d40563 100644 --- a/meta/classes/rootfs.bbclass +++ b/meta/classes/rootfs.bbclass @@ -73,12 +73,15 @@ rootfs_do_qemu() { fi } -BOOTSTRAP_SRC = "${DEPLOY_DIR_BOOTSTRAP}/${ROOTFS_DISTRO}-host_${DISTRO}-${DISTRO_ARCH}" -BOOTSTRAP_SRC:${ROOTFS_ARCH} = "${DEPLOY_DIR_BOOTSTRAP}/${ROOTFS_DISTRO}-${ROOTFS_ARCH}" +BOOTSTRAP_SRC = "${DEPLOY_DIR_BOOTSTRAP}/${ROOTFS_DISTRO}-host_${DISTRO}-${DISTRO_ARCH}.tar.zst" +BOOTSTRAP_SRC:${ROOTFS_ARCH} = "${DEPLOY_DIR_BOOTSTRAP}/${ROOTFS_DISTRO}-${ROOTFS_ARCH}.tar.zst" rootfs_prepare[weight] = "25" rootfs_prepare(){ - sudo cp -Trpfx --reflink=auto '${BOOTSTRAP_SRC}/' '${ROOTFSDIR}' + sudo tar -xf "${BOOTSTRAP_SRC}" -C "${ROOTFSDIR}" --exclude="./dev/console" + + # setup chroot + sudo "${ROOTFSDIR}/chroot-setup.sh" "setup" "${ROOTFSDIR}" } ROOTFS_CONFIGURE_COMMAND += "rootfs_configure_isar_apt" @@ -222,7 +225,7 @@ cache_deb_src() { # Note: ISAR updates the apt state information(apt-get update) only once during bootstrap and # relies on that through out the build. Copy that state information instead of apt-get update # which generates a new state from upstream. - sudo cp -Trpn --reflink=auto "${BOOTSTRAP_SRC}/var/lib/apt/lists/" "${ROOTFSDIR}/var/lib/apt/lists/" + sudo tar -xf "${BOOTSTRAP_SRC}" ./var/lib/apt/lists --one-top-level="${ROOTFSDIR}" deb_dl_dir_import ${ROOTFSDIR} ${ROOTFS_BASE_DISTRO}-${BASE_DISTRO_CODENAME} debsrc_download ${ROOTFSDIR} ${ROOTFS_BASE_DISTRO}-${BASE_DISTRO_CODENAME} diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc index d8ac9d00..cb1fc91a 100644 --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc @@ -16,7 +16,6 @@ PV = "1.0" BOOTSTRAP_FOR_HOST ?= "0" DEBOOTSTRAP = "mmdebstrap" -ROOTFSDIR = "${WORKDIR}/rootfs" APTPREFS = "${WORKDIR}/apt-preferences" APTSRCS = "${WORKDIR}/apt-sources" APTSRCS_INIT = "${WORKDIR}/apt-sources-init" @@ -287,9 +286,6 @@ do_bootstrap() { fi E="${@ isar_export_proxies(d)}" - sudo rm -rf --one-file-system "${ROOTFSDIR}" - mkdir -p "${ROOTFSDIR}" - if [ "${ISAR_USE_CACHED_BASE_REPO}" = "1" ]; then base_apt_tmp="$(mktemp -d /tmp/isar-base-aptXXXXXXXXXX)" bootstrap_list="${WORKDIR}/sources.list.d/base-apt.list" @@ -394,18 +390,9 @@ do_bootstrap() { "${WORKDIR}/rootfs.tar.zst" \ "$bootstrap_list" - sudo -E -s <<'EOSUDO' - set -e - - tar -xf "${WORKDIR}/rootfs.tar.zst" -C "${ROOTFSDIR}" --exclude="./dev/console" - - # setup chroot - install -v -m755 "${WORKDIR}/chroot-setup.sh" "${ROOTFSDIR}/chroot-setup.sh" - "${ROOTFSDIR}/chroot-setup.sh" "setup" "${ROOTFSDIR}" + # Finalize debootstrap by setting the link in deploy + sudo ln -Tfsr "${WORKDIR}/rootfs.tar.zst" "${DEPLOY_ISAR_BOOTSTRAP}.tar.zst" - # Finalize debootstrap by setting the link in deploy - ln -Tfsr "${ROOTFSDIR}" "${DEPLOY_ISAR_BOOTSTRAP}" -EOSUDO if [ "${ISAR_USE_CACHED_BASE_REPO}" != "1" ]; then deb_dl_dir_export "${WORKDIR}/dl_dir" "${BOOTSTRAP_BASE_DISTRO}-${BASE_DISTRO_CODENAME}" sudo rm -rf --one-file-system "${WORKDIR}/dl_dir" @@ -420,15 +407,15 @@ SSTATEPOSTINSTFUNCS += "bootstrap_sstate_finalize" bootstrap_sstate_prepare() { # this runs in SSTATE_BUILDDIR, which will be deleted automatically - sudo cp -a "$(dirname "${ROOTFSDIR}")/rootfs.tar.zst" ./bootstrap.tar.zst + sudo cp -a "${WORKDIR}/rootfs.tar.zst" ./bootstrap.tar.zst sudo chown $(id -u):$(id -g) bootstrap.tar.zst } bootstrap_sstate_finalize() { # this runs in SSTATE_INSTDIR if [ -f bootstrap.tar.zst ]; then - mv bootstrap.tar.zst "$(dirname "${ROOTFSDIR}")/rootfs.tar.zst" - sudo ln -Tfsr "$(dirname "${ROOTFSDIR}")/rootfs.tar.zst" \ + mv bootstrap.tar.zst "${WORKDIR}/rootfs.tar.zst" + sudo ln -Tfsr "${WORKDIR}/rootfs.tar.zst" \ "${DEPLOY_ISAR_BOOTSTRAP}.tar.zst" fi }