From patchwork Wed Sep 27 04:33:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Uladzimir Bely X-Patchwork-Id: 3137 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-lj1-f189.google.com (mail-lj1-f189.google.com [209.85.208.189]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 38R4XW5V022023 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 27 Sep 2023 06:33:33 +0200 Received: by mail-lj1-f189.google.com with SMTP id 38308e7fff4ca-2b6fdb8d0acsf28958881fa.0 for ; Tue, 26 Sep 2023 21:33:33 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1695789206; cv=pass; d=google.com; s=arc-20160816; b=GFhkqWNEh5eyg/HrAjvI2gorAqm4jh21qI2452EXW2DRTJcn6cnviPXAU6U3BvSLPf stC2Bh22qJx0vOyRga1z57iAkEA9XtwlwyLWxOk0DBQxeY9dcunMQhmdx+FiKCmYOasm BfSpa8j0murxWjiegPjc58a2FBkENtsiBDOF0XMnxvitnR7yoiznQFGFIFEdlUam7jQr afwBWqN7MpBExeC7FK5Vlxzic1vtE8hsmCB/bHLTXwApZo4y5O6dPnV+tVg7YHDtSYNs +P4l1ItSxYkf/7vYXYZPyF9damBq9ZYkfEwkf1zQ2HEvFTHQ0SMje0Iik3WbKRt63UgF rp9w== 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=Wx0ooM/b8ieybBwjxE0VqPBaZvkIrPhoNW8quDOHKwU=; fh=7tclEdh7YbwSQowgJ6LNq720O7H5HTEaqj22NJWRE2E=; b=xvdKrohSO+joW6rPISSfD9C0uVRMiaJN9U6y88MLQIUgATzp0EUme1wPpK5WNXkpJT 6og384LrFMMK6knZLP3vjagJzYQ+coNrZyP9WQ3XbYkPAZqMKMBhRjUAjkTUUasYWSnD m2FRQhqWGiGCmuNvSZXfBLqmAVwrmV1r8QbJi/JBBUm6KAWkPuuwuJlMeEGqY+AUZftJ g2v4CvKRTedH05sQrS0//Ey1PgzP+Ahy5+/dewGB1sMhJPcdjWA3tpnEYMrIkrYJq3iE ybo1W1L1f2nMM40qpW85Xnf8NTQRPt/HgvjYB9TY8MbPSn53zt93LBi4YfcJbp74cIQV Xwig== 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=Wx0ooM/b8ieybBwjxE0VqPBaZvkIrPhoNW8quDOHKwU=; b=p1qAlABZi87RvlKw3LQD/XzeIrRP0m6zrD2Qy+JJNqQqgFvR/PJrovclj4nOK9skl5 UqT0L/p1VQT9ssmUnnphJLB/kVCI5Z4aPqYjxsWAX/AOkYFLEuus9qSznvHOD0/xkWAS gOSRzhzAwRcNG0Y66pxgJB4AmMkF3zObcIKuZYH5bTa1yASEDPplEB32irBxXCxO7ZQR cnhm9hFZwSi9WFu1976r1EeuGakhk32qi1P9GjqAIkPsiBrjbTfeF8/4/rlwDCyIQuwc QA/kqL7rhHcSmwJ8ALVduVHmWxHejXd/cyqmyHFToOlg/DOh3rOa1oi1W2uIzGefSosl 6K6A== 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=Wx0ooM/b8ieybBwjxE0VqPBaZvkIrPhoNW8quDOHKwU=; b=mxcAbf285Bbf0XCIGu6qEuVEKxyxnQJTQ3M3LgVNSi3QbIpMVBMHLldUZ3w7emE5qf ufXfHbi+cGrjLbG5K8mEdkK8e+ZzUzwzFeyP+fbG+iJf24ETFZgY1g6bbsLlLypq1CHe 4SnYLfgAasHBoglMqwicVyrNhtXys2bBPyo+fccFEZOGeEhtszH8EDY1KWAld0/hqNps GhMjb30qF7D1VCCVhUAr8ZCBO00urnJu/a4G/UPArc2sqE74FHS1cvCIbq2WRJCMshxF c8BsyWS72tj1HbhJL0dJT13sWHpKNQsbtBuwo+YgGaXXM9Go74KFgEN38ibil6ZVjIBg fixA== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOJu0YxfTNt9rTOo2RJtxOlGZF8nt/iacWV8dZ49qgcTaqmb2Hiuua4v QwAxbnpNRVwPgITWrMirEnI= X-Google-Smtp-Source: AGHT+IFWvYCxi4eTXHnFLi3QLfqyXHzEvqc2ftmsVE61TWpYfxHOdMVukciTFh7PTjyGucdP6RqCLw== X-Received: by 2002:ac2:548b:0:b0:501:b1c0:d545 with SMTP id t11-20020ac2548b000000b00501b1c0d545mr531580lfk.3.1695789204842; Tue, 26 Sep 2023 21:33:24 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a19:9112:0:b0:500:83e8:9d2c with SMTP id t18-20020a199112000000b0050083e89d2cls310293lfd.1.-pod-prod-04-eu; Tue, 26 Sep 2023 21:33:22 -0700 (PDT) X-Received: by 2002:a05:6512:1591:b0:503:5cd:998b with SMTP id bp17-20020a056512159100b0050305cd998bmr713004lfb.28.1695789202652; Tue, 26 Sep 2023 21:33:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695789202; cv=none; d=google.com; s=arc-20160816; b=xpOo7kiaRCiGJ+XbpEGCPjGEHRClLpjKWhw7g7bBi3eXgT6ppPTPXRpyVaHfFMKXfK jWdx7PFC1NXcTx1P8j5m7rMcAOtsmPR+9B+T/USAlzF6htcgMVE6NlXfJWhSlRUSJFfw HeN+Whxybrsv5/5DKilAYtdIi0J8rjMfS64wJeNndAc6zQGevMljXYUPBZWoyP2xIthD hdG93VZPW265kJQwsSyRehATcftfQXwrJUbI6Jt/iw9msh+8Yh2eIN+b98SQA2TLcSp9 8HJ8NEDFvr8Mu+3bQbyeymw0/IQyObiYVIqsJOEgU/daGBwSRohMQcDVixx+yQDspGVg ZSuQ== 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=2goDuKTbsNG99hOxMjCo9pY2xIRh9MR8EjRYdArj+0U=; fh=7tclEdh7YbwSQowgJ6LNq720O7H5HTEaqj22NJWRE2E=; b=JgEnxHe/mEG8ZFkaLvoaWu35T6PZJ8vur6xpmBZ2KIhj3QzJt2j3+zHpsaVZ77QeIu brMjPqV32mrO/gqe5MnfEvLHuw6jpPlF2zfjB4pS4MCMYnydln0C3NiEDTBvHOGI853O sQdPuR74GXeJx5UDn3L2Rn+GMkU/WOdQGbjnouBnA5yld6CRKJoyPJtvwuFL33XoZn4M a1xF0zkjFXxKCqupIFWNLdzMKaOaV48yALDyoduAjk95A2oGgnSStHcm9eJBN/zOswuX tGpfaWQFH3WHWIKpmOUX9sE2obj9bGjSYKKt8uOFhvAMv/EQEXeq4/xtAd1iUwWtpv9f wttQ== 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 b9-20020a056512070900b004fe3ba741c8si936154lfs.8.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 38R4XKXl021959 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 27 Sep 2023 06:33:21 +0200 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v4 1/6] meta: Switch to mmdebstrap Date: Wed, 27 Sep 2023 06:33:15 +0200 Message-Id: <20230927043320.6264-2-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?= Instead of debootstrap, use mmdebstrap alternative. Internally, it uses apt and allows to debootstrap the distro from multiple repositories. Signed-off-by: Uladzimir Bely Signed-off-by: Anton Mikanovich --- meta-isar/conf/distro/ubuntu-common.inc | 4 -- .../isar-bootstrap/isar-bootstrap.inc | 57 ++++++++++--------- 2 files changed, 30 insertions(+), 31 deletions(-) diff --git a/meta-isar/conf/distro/ubuntu-common.inc b/meta-isar/conf/distro/ubuntu-common.inc index 6a990a89..afe96b73 100644 --- a/meta-isar/conf/distro/ubuntu-common.inc +++ b/meta-isar/conf/distro/ubuntu-common.inc @@ -18,10 +18,6 @@ HOST_DISTRO_BOOTSTRAP_KEYS += "${BOOTSTRAP_KEY}" # kernel package name is linux-image-generic in Ubuntu KERNEL_NAME = "generic" - -# that is what debootstrap_1.0.118ubuntu1 does anyways -DISTRO_DEBOOTSTRAP_SCRIPT = "/usr/share/debootstrap/scripts/gutsy" - DISTRO_CONFIG_SCRIPT ?= "debian-configscript.sh" DISTRO_KERNELS ?= " \ diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc index 3477c2fb..637018c6 100644 --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc @@ -15,7 +15,7 @@ PV = "1.0" BOOTSTRAP_FOR_HOST ?= "0" -DEBOOTSTRAP ?= "qemu-debootstrap" +DEBOOTSTRAP = "mmdebstrap" ROOTFSDIR = "${WORKDIR}/rootfs" APTPREFS = "${WORKDIR}/apt-preferences" APTSRCS = "${WORKDIR}/apt-sources" @@ -23,12 +23,14 @@ APTSRCS_INIT = "${WORKDIR}/apt-sources-init" DISTRO_BOOTSTRAP_KEYFILES = "" THIRD_PARTY_APT_KEYFILES = "" DEPLOY_ISAR_BOOTSTRAP ?= "" -DISTRO_BOOTSTRAP_BASE_PACKAGES = "locales" +DISTRO_BOOTSTRAP_BASE_PACKAGES = "locales,usrmerge" DISTRO_BOOTSTRAP_BASE_PACKAGES:append:gnupg = ",gnupg" DISTRO_BOOTSTRAP_BASE_PACKAGES:append:https-support = ",ca-certificates" DISTRO_VARS_PREFIX ?= "${@'HOST_' if d.getVar('BOOTSTRAP_FOR_HOST') == '1' else ''}" BOOTSTRAP_DISTRO = "${@d.getVar('HOST_DISTRO' if d.getVar('BOOTSTRAP_FOR_HOST') == '1' else 'DISTRO')}" BOOTSTRAP_BASE_DISTRO = "${@d.getVar('HOST_BASE_DISTRO' if d.getVar('BOOTSTRAP_FOR_HOST') == '1' else 'BASE_DISTRO')}" +BOOTSTRAP_DISTRO_ARCH = "${@d.getVar('HOST_ARCH' if d.getVar('BOOTSTRAP_FOR_HOST') == '1' else 'DISTRO_ARCH')}" +BOOTSTRAP_TMPDIR = "${WORKDIR}/tempdir" FILESEXTRAPATHS:append = ":${BBPATH}" inherit deb-dl-dir @@ -267,7 +269,7 @@ do_bootstrap[vardeps] += " \ ISAR_ENABLE_COMPAT_ARCH \ ${DISTRO_VARS_PREFIX}DISTRO_APT_SOURCES \ " -do_bootstrap[dirs] = "${DEPLOY_DIR_BOOTSTRAP}" +do_bootstrap[dirs] = "${DEPLOY_DIR_BOOTSTRAP} ${BOOTSTRAP_TMPDIR}" do_bootstrap[depends] = "base-apt:do_cache isar-apt:do_cache_config" do_bootstrap[network] = "${TASK_USE_NETWORK_AND_SUDO}" @@ -283,27 +285,31 @@ do_bootstrap() { if [ -f "${DISTRO_BOOTSTRAP_KEYRING}" ]; then debootstrap_args="$debootstrap_args --keyring=${DISTRO_BOOTSTRAP_KEYRING}" fi - if [ "${ISAR_USE_CACHED_BASE_REPO}" = "1" -a -z "${BASE_REPO_KEY}" ]; then - debootstrap_args="$debootstrap_args --no-check-gpg" - fi E="${@ isar_export_proxies(d)}" - export BOOTSTRAP_FOR_HOST debootstrap_args E + export BOOTSTRAP_FOR_HOST - sudo rm -rf --one-file-system "${ROOTFSDIR}" deb_dl_dir_import "${ROOTFSDIR}" "${BOOTSTRAP_BASE_DISTRO}-${BASE_DISTRO_CODENAME}" + sudo rm -rf --one-file-system "${ROOTFSDIR}" + mkdir -p "${ROOTFSDIR}" + + if [ ! -z "${SOURCE_DATE_EPOCH}" ]; then + export SOURCE_DATE_EPOCH="${SOURCE_DATE_EPOCH}" + fi + + arch_param="--arch=${BOOTSTRAP_DISTRO_ARCH},${DISTRO_ARCH}" + + sudo TMPDIR="${BOOTSTRAP_TMPDIR}" ${DEBOOTSTRAP} $debootstrap_args \ + $arch_param \ + --mode=unshare \ + ${@get_distro_components_argument(d)} \ + "${@get_distro_suite(d)}" \ + "${WORKDIR}/rootfs.tar.zst" \ + "${@get_distro_source(d)}" sudo -E -s <<'EOSUDO' set -e - if [ "${BOOTSTRAP_FOR_HOST}" = "0" ]; then - arch_param="--arch=${DISTRO_ARCH}" - fi - ${DEBOOTSTRAP} $debootstrap_args \ - $arch_param \ - ${@get_distro_components_argument(d)} \ - "${@get_distro_suite(d)}" \ - "${ROOTFSDIR}" \ - "${@get_distro_source(d)}" \ - ${DISTRO_DEBOOTSTRAP_SCRIPT} + + tar -xf "${WORKDIR}/rootfs.tar.zst" -C "${ROOTFSDIR}" --exclude="./dev/console" # Install apt config mkdir -p "${ROOTFSDIR}/etc/apt/preferences.d" @@ -406,19 +412,16 @@ SSTATEPOSTINSTFUNCS += "bootstrap_sstate_finalize" bootstrap_sstate_prepare() { # this runs in SSTATE_BUILDDIR, which will be deleted automatically - lopts="--one-file-system --exclude=var/cache/apt/archives" - sudo tar -C $(dirname "${ROOTFSDIR}") -cpSf bootstrap.tar $lopts $(basename "${ROOTFSDIR}") - sudo chown $(id -u):$(id -g) bootstrap.tar + sudo cp -a "$(dirname "${ROOTFSDIR}")/rootfs.tar.zst" ./bootstrap.tar.zst + sudo chown $(id -u):$(id -g) bootstrap.tar.zst } bootstrap_sstate_finalize() { # this runs in SSTATE_INSTDIR - # - after building the bootstrap, the tar won't be there, but we also don't need to unpack - # - after restoring from cache, there will be a tar which we unpack and then delete - if [ -f bootstrap.tar ]; then - sudo tar -C $(dirname "${ROOTFSDIR}") -xpf bootstrap.tar - sudo ln -Tfsr "${ROOTFSDIR}" "${DEPLOY_ISAR_BOOTSTRAP}" - rm bootstrap.tar + if [ -f bootstrap.tar.zst ]; then + mv bootstrap.tar.zst "$(dirname "${ROOTFSDIR}")/rootfs.tar.zst" + sudo ln -Tfsr "$(dirname "${ROOTFSDIR}")/rootfs.tar.zst" \ + "${DEPLOY_ISAR_BOOTSTRAP}.tar.zst" fi } From patchwork Wed Sep 27 04:33:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Uladzimir Bely X-Patchwork-Id: 3138 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-lj1-f188.google.com (mail-lj1-f188.google.com [209.85.208.188]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 38R4XWUe022018 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 27 Sep 2023 06:33:33 +0200 Received: by mail-lj1-f188.google.com with SMTP id 38308e7fff4ca-2bffd454256sf154020051fa.1 for ; Tue, 26 Sep 2023 21:33:33 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1695789206; cv=pass; d=google.com; s=arc-20160816; b=cJFchjdu1NxATVeEEYG0ctdBbLfpfpNoloTxssbnRYjPyu+D1THCuU/iD2mC5vDdnP KfSJC/XyNesokDNfcozGs9V/iZ36Kh721nWVEclMOBDkNKlLQaMC18AJ5qF7OZd+lmY7 pC75vgc3FPEspXiU7kjBztHXqETECmtLEwyNZNHrHuLG9sNPBU+pw7Axr86+87iNtX2z RSSwqQOP9ayBoa0dctO2iSB8D16A/l5KOMIxFpS1jWDAkBfJ5glyPgRr3UmBQKoHhE2z pWlmUCJmAuWntS2imG20fBT8yTTzgSu3Y3E/5t64S0MPoN7guks9nwPEg7hA0F5Fbck2 s0pg== 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=49njVoIGIXStMSbwv6z/BHjhi23yXnqK9Yzq4oEPE6A=; fh=7tclEdh7YbwSQowgJ6LNq720O7H5HTEaqj22NJWRE2E=; b=JJLuKAF6ME5AOWCa1dtyGyIRYbZh9sio8z6M6/1sDMqjpbXj1kYn8vhd+gmQn52apF 84DhFvA8kpIM+oSGDj6Ahk8GgiS2msJw7oTLD6mlj0ihET/3FmTECI2nFCEpFT55SnwC aVqOF22cCaPv/6an5OMV3LUeuYBhavBpEACt1kOCvvvH9L2ji9jTJbmIoFg7/bOgJ4nK CR+cB30FwhiTpOSdbTuF6dFFa7Gd35pz6tDdRI3MkyVuq8A2wD2UjfOdG1JTVwnlgXko rmPkUgPqGaHHf1ly3Rsie6MUmD4ggBXA19mLYHk+5wjeoH+pGTazIy9gDLEDpHwUFF3S tCMA== 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=49njVoIGIXStMSbwv6z/BHjhi23yXnqK9Yzq4oEPE6A=; b=GAsttOzI2aN6JWyISsaHhmKMjwa+Y6REldJlo4mzCwvudhpWwPdJshq9rsBaErxAZX 4FGr34oHnIafeUsycBfn2KwgDpVLnb0Ov8uxvoOvVq610ctkYI/KnY9iKY2fnsGU+jEZ oWx817yBuh01BEbyY/MwLwWfs1RR911JJqGulHMenu1w6zzviAr0KjbvcighboRedkIc +9at68xDYBw18VP0ZxIe09pexWDT26ss+BPVNDWaCQV5llJLa0s2mB9mmUN3Z90jg4ZR h7HxYeVJ4+meHfCldXC96/EYGHEquW8/tpa2ftmeXCjijNlrCzUxy2wyogARatFK8ykk +XgQ== 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=49njVoIGIXStMSbwv6z/BHjhi23yXnqK9Yzq4oEPE6A=; b=mVvIfdw7rb259hzEjD6C5BZwdKrQsfGaoSUONwMSCnF0jvMY5QsK+hU8y8k2EwAECf /eicYJmx5UzZEddAksuzwT/BgzLSCDKtCJpemo6XXmEM1/d7ab8MLgL2zvYUqvxjBbGf nRrbOTBo987X9ErjnKXBYE411mp4azJRprMGzLuWYIqFMgj792O2LJ9DSeU/SGs6/zl2 9tjzlSw2PWOQippRrjp8rnsMoTG6xm+KrVX1hydiVKwMvK2zm0VG4ZMLJSpo5YNw92nq ciWY9GStanWlldyeTgRrjtwlWpk1NTJGTn3H+tPsvlLooM9o0t0sMTb4/Voon+qKi94+ m37Q== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOJu0YwirxgYKZETnmj7HkcY9MLP5R4cCMk/RifSds8OxJQEupjBUHsT DTqGS2A8kRHoW5BN42pleo8= X-Google-Smtp-Source: AGHT+IHej8wY6R/qZyjzi3CYV4rNS4QpPfgqJqZ1FaSFKqZ17Sohh9VSTuBLwAlLNQzMKBzPJs666Q== X-Received: by 2002:a2e:9b18:0:b0:2bc:f60c:445f with SMTP id u24-20020a2e9b18000000b002bcf60c445fmr837808lji.36.1695789205022; Tue, 26 Sep 2023 21:33:25 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:b4b2:0:b0:2c1:20cc:b522 with SMTP id q18-20020a2eb4b2000000b002c120ccb522ls691465ljm.0.-pod-prod-09-eu; Tue, 26 Sep 2023 21:33:23 -0700 (PDT) X-Received: by 2002:a2e:9b18:0:b0:2bc:f60c:445f with SMTP id u24-20020a2e9b18000000b002bcf60c445fmr837754lji.36.1695789203026; 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=q+w+9fkhD/W8f8eRe24ovKUASkc7hwL9HQtz55LNlKsISiNBPcXWBQscU42YRku0a/ vryX+EV9p6dQv7cXAYBXjZdz+ePsDB1pBTt75vStstjqbiYcX1U2BTmX/MenOVyDc7yG fMJZifiXZHE9O5mVOLVZw2aSlZJ9i6su5nbLbZBUNnaWo3fzyYVjKOp/442snkH0aYL1 r8PTPkrk4SaSgD/CYBC4qPV+YePFpcsILBdd7FCQMrqyjTj5u40pgs9J8LlFlyQ3pDkY lwOJlgy+t+n62x6x8Vazdl692hJDdF0BwbgmY6l6/0OevGB6tThaUiuIyvs/hfsjGOrW +6Pw== 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=lscX1d6qgKyEjeSRhZLMAyZpISjhJf1/FKz1gXwzOgA=; fh=7tclEdh7YbwSQowgJ6LNq720O7H5HTEaqj22NJWRE2E=; b=i/O9iXnkMwiynB/NWQ/43TyjxEnVx8wJbfkiPr5qTelsYGAaStxfMZFiHXRHUUvPln kPdRIbTAKkwCNdikMjmHjtYAXIjnGopAZzDT7lM6fGA/rplMbC5zHriBk012kDef/93P oImAumH53NIPFJsX/0uwv/gmpzcKv5j6SeISV/oWa62eUUrQOWpze5uh+kZ8E5x9w8gJ wNHzhOlcEATm0AebIJIg6u/6UmPnTXR3Q0a+1163zVHm2Q1F1jf49dcNWHs8TPny4mC6 q0cIhmvJBFhLeiMjlxRk8Kb9e2oOZqbWfAli+O2eHh6msy/K+ClarXy0n8bdL8UFXM6e hqVQ== 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 h5-20020a2ebc85000000b002bb9bc937aesi951896ljf.8.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 38R4XKXm021959 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 27 Sep 2023 06:33:21 +0200 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v4 2/6] isar-bootstrap: Move preparations to hooks Date: Wed, 27 Sep 2023 06:33:16 +0200 Message-Id: <20230927043320.6264-3-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 Move all bootstrap rootfs prepare logic into mmdebstrap hooks. Signed-off-by: Anton Mikanovich --- .../isar-bootstrap/isar-bootstrap.inc | 196 +++++++++--------- 1 file changed, 102 insertions(+), 94 deletions(-) diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc index 637018c6..d8ac9d00 100644 --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc @@ -211,24 +211,21 @@ def get_distro_components_argument(d): else: return "" -APT_KEYS_DIR = "${WORKDIR}/aptkeys" DISTRO_BOOTSTRAP_KEYRING = "${WORKDIR}/distro-keyring.gpg" -do_generate_keyrings[cleandirs] = "${APT_KEYS_DIR}" -do_generate_keyrings[dirs] = "${DL_DIR}" +do_generate_keyrings[cleandirs] = "${WORKDIR}/trusted.gpg.d" +do_generate_keyrings[dirs] = "${DEBDIR}" do_generate_keyrings[vardeps] += "DISTRO_BOOTSTRAP_KEYS THIRD_PARTY_APT_KEYS" do_generate_keyrings[network] = "${TASK_USE_SUDO}" do_generate_keyrings() { if [ -n "${@d.getVar("THIRD_PARTY_APT_KEYFILES") or ""}" ]; then - chmod 777 "${APT_KEYS_DIR}" for keyfile in ${@d.getVar("THIRD_PARTY_APT_KEYFILES")}; do - cp "$keyfile" "${APT_KEYS_DIR}"/"$(basename "$keyfile")" + sudo apt-key --keyring "${DISTRO_BOOTSTRAP_KEYRING}" add $keyfile done fi if [ -n "${@d.getVar("DISTRO_BOOTSTRAP_KEYFILES") or ""}" ]; then for keyfile in ${@d.getVar("DISTRO_BOOTSTRAP_KEYFILES")}; do sudo apt-key --keyring "${DISTRO_BOOTSTRAP_KEYRING}" add $keyfile - cp "$keyfile" "${APT_KEYS_DIR}"/"$(basename "$keyfile")" done fi } @@ -269,12 +266,14 @@ do_bootstrap[vardeps] += " \ ISAR_ENABLE_COMPAT_ARCH \ ${DISTRO_VARS_PREFIX}DISTRO_APT_SOURCES \ " -do_bootstrap[dirs] = "${DEPLOY_DIR_BOOTSTRAP} ${BOOTSTRAP_TMPDIR}" +do_bootstrap[dirs] = "${DEPLOY_DIR_BOOTSTRAP} ${BOOTSTRAP_TMPDIR} ${WORKDIR}/trusted.gpg.d ${WORKDIR}/sources.list.d" do_bootstrap[depends] = "base-apt:do_cache isar-apt:do_cache_config" do_bootstrap[network] = "${TASK_USE_NETWORK_AND_SUDO}" inherit compat +DEB_DL_LOCK ?= "${DEBDIR}/${BOOTSTRAP_BASE_DISTRO}-${BASE_DISTRO_CODENAME}.lock" + do_bootstrap() { if [ "${ISAR_ENABLE_COMPAT_ARCH}" = "1" ]; then if [ -z "${COMPAT_DISTRO_ARCH}" ]; then @@ -284,124 +283,133 @@ do_bootstrap() { debootstrap_args="--verbose --variant=minbase --include=${DISTRO_BOOTSTRAP_BASE_PACKAGES}" if [ -f "${DISTRO_BOOTSTRAP_KEYRING}" ]; then debootstrap_args="$debootstrap_args --keyring=${DISTRO_BOOTSTRAP_KEYRING}" + cp "${DISTRO_BOOTSTRAP_KEYRING}" "${WORKDIR}/trusted.gpg.d/" fi E="${@ isar_export_proxies(d)}" - export BOOTSTRAP_FOR_HOST - deb_dl_dir_import "${ROOTFSDIR}" "${BOOTSTRAP_BASE_DISTRO}-${BASE_DISTRO_CODENAME}" 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" + line="copy://$base_apt_tmp/${BOOTSTRAP_BASE_DISTRO} ${BASE_DISTRO_CODENAME} main" + if [ -z "${BASE_REPO_KEY}" ]; then + line="[trusted=yes] ${line}" + fi + echo "deb ${line}" > "${WORKDIR}/sources.list.d/base-apt.list" + line="copy://$base_apt_tmp/${BASE_DISTRO} ${BASE_DISTRO_CODENAME} main" + if [ -z "${BASE_REPO_KEY}" ]; then + line="[trusted=yes] ${line}" + fi + echo "deb-src ${line}" >> "${WORKDIR}/sources.list.d/base-apt.list" + + # no need to sync /var/cache/apt/archives if base-apt used + syncin='echo skip sync-in' + syncout='echo skip sync-out' + extra_setup="mount --bind '${REPO_BASE_DIR}' $base_apt_tmp" + extra_extract="$syncout" + # save mmdebstrap tempdir for cleanup + extra_essential="mkdir -p \$1/$base_apt_tmp && \ + echo \$1 > ${WORKDIR}/mmtmpdir && \ + mount --bind '${REPO_BASE_DIR}' \$1/$base_apt_tmp" + # replace base-apt mount in tmp with /base-apt mount + extra_customize="sed -i \"s|copy://$base_apt_tmp|file:///base-apt|g\" \ + \$1/etc/apt/sources.list.d/*.list && \ + mkdir -p \$1/base-apt && \ + mount --bind '${REPO_BASE_DIR}' \$1/base-apt && \ + chroot \$1 apt-get update -y \ + -o APT::Update::Error-Mode=any && \ + umount \$1/base-apt && \ + umount \$1/$base_apt_tmp && rm ${WORKDIR}/mmtmpdir && \ + umount $base_apt_tmp && rm -rf --one-file-system $base_apt_tmp" + else + deb_dl_dir_import "${WORKDIR}/dl_dir" "${BOOTSTRAP_BASE_DISTRO}-${BASE_DISTRO_CODENAME}" + + bootstrap_list="${WORKDIR}/sources.list.d/bootstrap.list" + install -v -m644 "${APTSRCS}" \ + "${WORKDIR}/sources.list.d/bootstrap.list" + + syncin='flock -s ${DEB_DL_LOCK} cp -n --no-preserve=owner \ + "${WORKDIR}/dl_dir/var/cache/apt/archives/"*.deb \ + "$1/var/cache/apt/archives/" || true' + syncout='flock -s ${DEB_DL_LOCK} cp -n --no-preserve=owner \ + "$1/var/cache/apt/archives/"*.deb \ + "${WORKDIR}/dl_dir/var/cache/apt/archives/"' + extra_setup="$syncin" + extra_extract="$syncout" + # prefetch apt debs because mmdebstrap will clean them on next stage + extra_essential='apt-get install apt -y -d \ + -o Dir::State="$1/var/lib/apt" \ + -o Dir::Etc="$1/etc/apt" \ + -o Dir::Cache="$1/var/cache/apt" \ + -o Apt::Architecture="${BOOTSTRAP_DISTRO_ARCH}"' + extra_essential="$extra_essential && $syncout" + extra_customize="$syncout" + fi + if [ ! -z "${SOURCE_DATE_EPOCH}" ]; then export SOURCE_DATE_EPOCH="${SOURCE_DATE_EPOCH}" fi arch_param="--arch=${BOOTSTRAP_DISTRO_ARCH},${DISTRO_ARCH}" + if [ "${ISAR_ENABLE_COMPAT_ARCH}" = "1" ]; then + arch_param="$arch_param,${COMPAT_DISTRO_ARCH}" + fi + + # Cleanup mounts if fails + trap 'exit 1' INT HUP QUIT TERM ALRM USR1 + trap '[ -r "${WORKDIR}/mmtmpdir" ] && tmpdir=$(cat "${WORKDIR}/mmtmpdir") \ + && rm "${WORKDIR}/mmtmpdir"; \ + [ -d "$tmpdir" ] && mountpoint -q $tmpdir/$base_apt_tmp \ + && sudo umount $tmpdir/$base_apt_tmp; \ + [ -d "$tmpdir" ] && mountpoint -q $tmpdir/base-apt \ + && sudo umount $tmpdir/base-apt; \ + [ -d "$tmpdir" ] && sudo rm -rf --one-file-system $tmpdir; \ + [ -n "$base_apt_tmp" ] && mountpoint -q $base_apt_tmp \ + && sudo umount $base_apt_tmp \ + && rm -rf --one-file-system $base_apt_tmp' EXIT sudo TMPDIR="${BOOTSTRAP_TMPDIR}" ${DEBOOTSTRAP} $debootstrap_args \ $arch_param \ --mode=unshare \ + --setup-hook='mkdir -p "$1/var/cache/apt/archives/"' \ + --setup-hook="$extra_setup" \ + --setup-hook='upload "${APTPREFS}" /etc/apt/preferences.d/bootstrap' \ + --setup-hook='upload "${APTSRCS_INIT}" /etc/apt/sources-list' \ + --setup-hook='upload "${WORKDIR}/locale" /etc/locale' \ + --setup-hook='mkdir -p "$1/etc/apt/trusted.gpg.d"' \ + --setup-hook='sync-in "${WORKDIR}/trusted.gpg.d" /etc/apt/trusted.gpg.d' \ + --setup-hook='install -v -m755 "${WORKDIR}/chroot-setup.sh" "$1/chroot-setup.sh"' \ + --extract-hook="$extra_extract" \ + --essential-hook="$extra_essential" \ + --customize-hook="$extra_customize" \ + --customize-hook='sed -i "/en_US.UTF-8 UTF-8/s/^#//g" "$1/etc/locale.gen"' \ + --customize-hook='chroot "$1" /usr/sbin/locale-gen' \ + --customize-hook='chroot "$1" /usr/bin/apt-get -y clean' \ + --skip=cleanup/apt \ + --skip=download/empty \ ${@get_distro_components_argument(d)} \ "${@get_distro_suite(d)}" \ "${WORKDIR}/rootfs.tar.zst" \ - "${@get_distro_source(d)}" + "$bootstrap_list" sudo -E -s <<'EOSUDO' set -e tar -xf "${WORKDIR}/rootfs.tar.zst" -C "${ROOTFSDIR}" --exclude="./dev/console" - # Install apt config - mkdir -p "${ROOTFSDIR}/etc/apt/preferences.d" - install -v -m644 "${APTPREFS}" \ - "${ROOTFSDIR}/etc/apt/preferences.d/bootstrap" - mkdir -p "${ROOTFSDIR}/etc/apt/sources.list.d" - if [ "${ISAR_USE_CACHED_BASE_REPO}" = "1" ]; then - line="file:///base-apt/${BOOTSTRAP_BASE_DISTRO} ${BASE_DISTRO_CODENAME} main" - if [ -z "${BASE_REPO_KEY}" ]; then - line="[trusted=yes] ${line}" - fi - echo "deb ${line}" > "${ROOTFSDIR}/etc/apt/sources.list.d/base-apt.list" - line="file:///base-apt/${BASE_DISTRO} ${BASE_DISTRO_CODENAME} main" - if [ -z "${BASE_REPO_KEY}" ]; then - line="[trusted=yes] ${line}" - fi - echo "deb-src ${line}" >> "${ROOTFSDIR}/etc/apt/sources.list.d/base-apt.list" - - mkdir -p ${ROOTFSDIR}/base-apt - mount --bind ${REPO_BASE_DIR} ${ROOTFSDIR}/base-apt - else - install -v -m644 "${APTSRCS}" \ - "${ROOTFSDIR}/etc/apt/sources.list.d/bootstrap.list" - fi - install -v -m644 "${APTSRCS_INIT}" "${ROOTFSDIR}/etc/apt/sources-list" - rm -f "${ROOTFSDIR}/etc/apt/sources.list" - rm -rf "${ROOTFSDIR}/var/lib/apt/lists/"* - find ${APT_KEYS_DIR}/ -type f | while read keyfile - do - MY_GPGHOME="$(chroot "${ROOTFSDIR}" mktemp -d /tmp/gpghomeXXXXXXXXXX)" - echo "Created temporary directory ${MY_GPGHOME} for gpg-agent" - export GNUPGHOME="${MY_GPGHOME}" - APT_KEY_APPEND="--homedir ${MY_GPGHOME}" - - kfn="$(basename $keyfile)" - cp $keyfile "${ROOTFSDIR}/tmp/$kfn" - chroot "${ROOTFSDIR}" /usr/bin/gpg-agent --daemon -- /usr/bin/apt-key \ - --keyring ${THIRD_PARTY_APT_KEYRING} ${APT_KEY_APPEND} add "/tmp/$kfn" - rm "${ROOTFSDIR}/tmp/$kfn" - - echo "Removing ${MY_GPGHOME}" - rm -rf "${ROOTFSDIR}${MY_GPGHOME}" - done - - # Set locale - install -v -m644 "${WORKDIR}/locale" "${ROOTFSDIR}/etc/locale" - - sed -i '/en_US.UTF-8 UTF-8/s/^#//g' "${ROOTFSDIR}/etc/locale.gen" - chroot "${ROOTFSDIR}" /usr/sbin/locale-gen - # setup chroot install -v -m755 "${WORKDIR}/chroot-setup.sh" "${ROOTFSDIR}/chroot-setup.sh" "${ROOTFSDIR}/chroot-setup.sh" "setup" "${ROOTFSDIR}" - # update APT - mount -o bind,private /dev ${ROOTFSDIR}/dev - mount --bind /dev/pts ${ROOTFSDIR}/dev/pts - mount -t tmpfs none "${ROOTFSDIR}/dev/shm" - mount -t proc none ${ROOTFSDIR}/proc - mount --rbind /sys ${ROOTFSDIR}/sys - mount --make-rslave ${ROOTFSDIR}/sys - - export DEBIAN_FRONTEND=noninteractive - - if [ "${BOOTSTRAP_FOR_HOST}" = "1" ]; then - chroot "${ROOTFSDIR}" /usr/bin/dpkg --add-architecture ${DISTRO_ARCH} - fi - - if [ "${ISAR_ENABLE_COMPAT_ARCH}" = "1" ]; then - chroot "${ROOTFSDIR}" /usr/bin/dpkg --add-architecture ${COMPAT_DISTRO_ARCH} - fi - - chroot "${ROOTFSDIR}" /usr/bin/apt-get update -y \ - -o APT::Update::Error-Mode=any - chroot "${ROOTFSDIR}" /usr/bin/apt-get install -y -f - chroot "${ROOTFSDIR}" /usr/bin/apt-get dist-upgrade -y \ - -o Debug::pkgProblemResolver=yes - - umount -l "${ROOTFSDIR}/dev/shm" - umount -l "${ROOTFSDIR}/dev/pts" - umount -l "${ROOTFSDIR}/dev" - umount -l "${ROOTFSDIR}/proc" - umount -l "${ROOTFSDIR}/sys" - umount -l "${ROOTFSDIR}/base-apt" || true - # Finalize debootstrap by setting the link in deploy ln -Tfsr "${ROOTFSDIR}" "${DEPLOY_ISAR_BOOTSTRAP}" EOSUDO - deb_dl_dir_export "${ROOTFSDIR}" "${BOOTSTRAP_BASE_DISTRO}-${BASE_DISTRO_CODENAME}" - - # Cleanup apt cache - sudo -Es chroot "${ROOTFSDIR}" /usr/bin/apt-get -y clean + 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" + fi } addtask bootstrap before do_build after do_generate_keyrings 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 } From patchwork Wed Sep 27 04:33:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Uladzimir Bely X-Patchwork-Id: 3139 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 38R4XX4a022041 (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-5033420dd31sf15014633e87.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=DDGz1i8AlHhulanNHVqh0BdF/JZmEFqu/A1DFSjlTQWGz7JjMncXNd7vcBHMvoAEHS /1ssZ1nGWQ7QWg5EbRo3Wue/WzT+PgHHD10r95KW8rb7z5s7edI5Qi74yaoAmeBJ7zGf 4LsppcWq0VeBh+eI/ti2B/m9g8P6HvfZiVZC47z+amlrTeWjgHBB0N6Vu3ctCrY5vuM3 LXkedaPL0xhDrdZQegwwL0hj7noESsV4koObQz4J0ZY0csWOQTevttZZ+kxvNPvevwgF r/0BSfSp6ZBw3U94adxG6Fs5KS5ZJuRQ1/9n2ltdQ3BUC+WtNgCC/FYYWJ45SElGsMyc yRiw== 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=tFYpH1n4M1M6fFsji60aHyDdmLs0J33l1JKyeI7KIUI=; fh=7tclEdh7YbwSQowgJ6LNq720O7H5HTEaqj22NJWRE2E=; b=dguWo40er/5r8KAOUMlyBUWuuvQeismL+KzexVi4OLxh7NO0/g/N6FKMT41xoXYlJD oHHgCSxIPl4muITxVjTsLg1m0oGMiw/9xj61goWk7Nb+KWtg1Gz5uqG6a0kW4ZitF5Tw BEiJxgfIeKieQWAeAruuAqCpK2qcbCt97DiTCNrmRwdN1T77aD7Uw/ZLhhh/xIGSvo7O nrtjfosv3nmedI0fD1I5tXl6uMcNHHtmghgdtdwuUICsuQtI4cswUlkVLJ6TbgamMVV1 fkwJG8YCVnL7iWhzdrnUTBRfuVREbdIALMTBuUWwgSmSa6s9HZZuiCgUmXc9wThBymqx uwDA== 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=tFYpH1n4M1M6fFsji60aHyDdmLs0J33l1JKyeI7KIUI=; b=ccgQNE6tFnuV/sKEYjX8GxCVE/v3JCZjCZDbdHnHNGwDONLhTuw3jOgbeEd07naxCJ Lo4RpIkLh77dUJ3ZgPkTf6eiepHYkShpIFMxLt1I4/yAZ30efZTy9QcXk4HIagy5qOTB Bh0bPqLuTgMO8w6IzJJ2/6vawwK+FYOHA5+o+gEMsIuR8eVkMhaVs0Wlj89T2XcaObxF CIhMaVv6XvkBHEV9SwluMvFj11DsVufpy27qEHSxYbSTqdzsP/qlAY+Dpi8rWwjL5PjX 7c02pzxxd1QHNxYdXmWcolChPIt/yuRkOBn7j+YkFiYhD/J5p2eUEGspNXILitVtC+1J bpbw== 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=tFYpH1n4M1M6fFsji60aHyDdmLs0J33l1JKyeI7KIUI=; b=MFr8OECbTlKJz7H7Q/fjm/WQRB1pfTqS55se2A0FobrEDRYVvgL9JpcdR6/lrj89lp Y46dM6IKJVH1XGRgy6EMb80L8eGAPpuuSwJdv31a1WnKdJ0iQx8ZyUvgZOk0rgci7LjJ F8cumkfrZl7Elb7C2nU2cGTDkz8u0ywgZqc0frk9w2MQZdH46IKbjntIbstF+Adaei7n vHlANy1UronhXO8ATWn3vBS1FVhyu1H8KOXQPY0imlb3U60Mjm3nOS3Z8YZRNV/5+n+U 53J3FSY1Rez23pmrju+9zezwZ+xwYoV8Hrnyx+H040aRx70OqwRDrH5z+iaQQqI92Zjy X8nQ== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOJu0Yz0qi9JWbcx5Byz3U1ITFZgvYvrfaNRjxq/NVz5IA3+GnfPBabe b6Vx6ahzZgU65wd8GWXSLfI= X-Google-Smtp-Source: AGHT+IFbGVdrooipaqRQKuUWgy6sf/P527Wg61GutatzlEGl8jLQy/87RHCtpqwQtxeoFBmgSUgIOg== X-Received: by 2002:a05:6512:210e:b0:500:b7dc:6c90 with SMTP id q14-20020a056512210e00b00500b7dc6c90mr561047lfr.36.1695789205422; Tue, 26 Sep 2023 21:33:25 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a19:675c:0:b0:4fe:28f1:9bff with SMTP id e28-20020a19675c000000b004fe28f19bffls81177lfj.2.-pod-prod-07-eu; Tue, 26 Sep 2023 21:33:23 -0700 (PDT) X-Received: by 2002:ac2:424d:0:b0:500:9734:545a with SMTP id m13-20020ac2424d000000b005009734545amr564086lfl.5.1695789203483; 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=Y7EpY1GFz2fyUOWMd465DDabHUsa+/dn7q+KVZ8CY+HccUfn7B/32ZxdY4BtY8RcES hJdlJxOGflkO9DkRR64oQqwoB1bLHLotd3FWlJnu3HfUwUGiosBfAc0DfXXZozbJLrgN WZHhLKYUrB0BNIgPTz5dVTz6iVC+tTE8u4Ge8Sao1G/jYEbAexloQKuCdFDQPHSayB6n NPfzQIl0kypMdCEnqli4StFLO/mCcMuucv5GuIyzG7EAJgyIIyHYVQQtfqNXtLvfk1JQ PvedcGKUWXwMHSE+SvALH5lXPei63G8os5CrpJ46SC8HC+PpQiAV8qTOPBkNCc7rwTX0 x8sA== 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=w59kMaI+jZAlnOo8aTUdDl2Hx0VTxszihG17m85gf6I=; fh=7tclEdh7YbwSQowgJ6LNq720O7H5HTEaqj22NJWRE2E=; b=S9iKgfzEQDZwy1xch2IgDinPHnJ+NxohhZKDWq4yfqgjuKTEr9u+jkhiZHQRVyK9DO BxcIjem2LvA/qskJ6VeEPJPGUkGdP0cwqGiT+yj6dyuQw8HM++tbJ1J/FqVX3wM9U6SP fxLQ7zZ+wl4n9r+LCO53VvFAqj6RctsLaqE00oOuiyz7CxAEM/Y2tOkZA93qwhCdzznk yuqMBrnNq+JEaOZdme6g/xolC/N43gHHO0kMbLHU/BiydwbjvZtxCvgmR3ZBreWa9xdr M745metm9yq45vVCkC38+m3kzKS6lzNNqEi1BA9mw3Hv72mnd/HH/DMBii+TWx+PWZ6k JcfQ== 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 m2-20020a056512358200b005042ae499b9si877738lfr.7.2023.09.26.21.33.23 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 26 Sep 2023 21:33:23 -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 38R4XKXo021959 (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 4/6] user_manual.md: Replace debootstrap with mmdebstrap Date: Wed, 27 Sep 2023 06:33:18 +0200 Message-Id: <20230927043320.6264-5-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 Update documentation in user manual. Signed-off-by: Anton Mikanovich --- doc/user_manual.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/doc/user_manual.md b/doc/user_manual.md index be47fdcc..dc7ed4c8 100644 --- a/doc/user_manual.md +++ b/doc/user_manual.md @@ -67,7 +67,9 @@ Install the following packages: apt install \ binfmt-support \ bzip2 \ - debootstrap \ + mmdebstrap \ + arch-test \ + apt-utils \ dpkg-dev \ gettext-base \ git \ @@ -127,7 +129,7 @@ apt install qemu ### Setup Sudo -Isar requires `sudo` rights without password to work with `chroot` and `debootstrap`. To add them, use the following steps: +Isar requires `sudo` rights without password to work with `chroot`. To add them, use the following steps: ``` # visudo ``` From patchwork Wed Sep 27 04:33:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Uladzimir Bely X-Patchwork-Id: 3141 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:35 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-lj1-f184.google.com (mail-lj1-f184.google.com [209.85.208.184]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 38R4XYUc022043 (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-lj1-f184.google.com with SMTP id 38308e7fff4ca-2b6fdb8d0acsf28959041fa.0 for ; Tue, 26 Sep 2023 21:33:34 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1695789207; cv=pass; d=google.com; s=arc-20160816; b=XfM8m0vg8Te1/yZS793EgPTsi1on2qoZalt38YF4Vi36GoH0uBOojhL6oezOwRwsQx dM1K9HiJ9Ofnp61vMbnrAFyX0IT/D6OksTHWllxM2SZuCaTIxzGvG7tBbsr29OdXstIN GDQpCaWH7nJ4E+3ZBj2K3m9PvFmtXIaFFPyRv6DZlHExcNlhjmS+wwH0hGfJFBrsujGT vB+mX/cV5mmJBVyQwxBqy7W5AGPgD6OnPFgkkJ6edbD7SbTKri3BXt2jD/7LkUzxnl18 wkFqlS4+KJOxX/AjnlqSWdNbQYd+3McedB9YbZqbGae+ZLR6jFJx1vkCSryGMSyaHvxy DgbA== 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=3r94B7jLDzjafVXqUe2nx7NOIv7Blt4Hh0U2ZTBVSW8=; fh=7tclEdh7YbwSQowgJ6LNq720O7H5HTEaqj22NJWRE2E=; b=RHw34YV+Il+wfz3txIZ+kY5xqADsZNm+gk4IC68KAZe6LkJI3kEUG4FDNU1Lqr2yy0 ZP9L7K3mqjxKHeiIjSRDU1QSLo1SRAap6XaBtSiUgiyB1SqTQpJ6SomsuQg3gCSHdW3W AWbwK6RiX4VPq54XNCI1aQ7ikLaL20wazFh3I69sdmwCsgtam3ODLCCWLjpSICB6aV0D pEqs8jvANoDGDZU4h+3H/cuo2/+G8sibnmBnXSlaekWV1CFHKZGYMWdkYU9wufKFV7+o KEMfbs4jq6agPjvwzzOoj+puv94eOVd/4/02jObhBDKhV9gybOCPwrz+sgPWxBhOiCXV sMWw== 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=1695789207; x=1696394007; 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=3r94B7jLDzjafVXqUe2nx7NOIv7Blt4Hh0U2ZTBVSW8=; b=LrNz83Z3aDFJHqwkGIDP4rq8r9xO/u29qHYRjw0t1wwe47b6y3rFNrWletjliKApse N2DHYgxRBDneOHMxvnWg2UR0zMciY5hQ0DBbxAJt8q5lnh8vJyPiDMghQRuhpDTVwl95 a2sip4vjoAyTv61fhRKSsO+9s0S2GOFcvk3kD2BgMsQ1BhdHntOdXUV4iKllpPUJSKyW hNpVBAaYGErLnXXGIeOo06M9SeDrBJL3d4HwtRy8FMsMNC9MR1Og9VMfwrbFNCFMYpiD VTtLAtqL0ApBAJ+iurX92adKwk8E7NG1BB0WAGxVLWHOc/AmMOOBYOWRwGobA5fxKGiy 2npg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695789207; x=1696394007; 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=3r94B7jLDzjafVXqUe2nx7NOIv7Blt4Hh0U2ZTBVSW8=; b=vlPBwPu+Ngtlr7+EsOeCNEUdYWoGObZl644OQEUtfL2PLOD+pSmGZ8i7mWXJ5PPiCg EcpRu0wVz5ULThjtZpYhKdOwJvLdDmSHD7Fz7c3Xu7L0IoCg74yKF6Fzn+MUfQslzcup BGDr8glJHG2o9DbpUE61fgBqxiXDO7Heg3+xajqz4zhRQ7DgmMsFv8muF88fDIkPvZxZ GnHte4qyGS6YUW+atDfA2pYEYotnXBmLM6NobZ+HzmLJllbVhez5K6oQ11RJW2pyxSsL CJkc+SGMcaz3hxf8t/GL8oPk2Vdg/myx/RKbbfWA+yzvIvByEBYBx0TVxJbJlPqJ87fE YLDg== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOJu0Yx5Mnn2FqLVn1V85AyN4c28kga7+0nLmgMOjkpo5Fi5HejmQ9I8 idtvih5SsWIa+3nX/tro7Wg= X-Google-Smtp-Source: AGHT+IGAZAPaD4rPkdkEt2EHaaxPRkHq+fLRTQ7wst3ikMuSGChUbE2iuL24NDkIN8KJpqssbMe1iw== X-Received: by 2002:a05:651c:1034:b0:2be:5485:4a99 with SMTP id w20-20020a05651c103400b002be54854a99mr794794ljm.4.1695789205733; Tue, 26 Sep 2023 21:33:25 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:bcc4:0:b0:2bf:f477:198c with SMTP id z4-20020a2ebcc4000000b002bff477198cls4196ljp.2.-pod-prod-07-eu; Tue, 26 Sep 2023 21:33:23 -0700 (PDT) X-Received: by 2002:a05:651c:218:b0:2bd:133c:2d71 with SMTP id y24-20020a05651c021800b002bd133c2d71mr835608ljn.52.1695789203628; 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=Gu6F2YY4I26B2Ash0u2xunKixgpBGdR47Szf8MKvkgsAJ7VuNxuIBRMQFtQcYSqs7W 97bzWzgVjnuKfRJqsSymldqS9sMbEo3oz4OxIxhoH9XkBc+W88RwpmA6hbwDy+ohGr5U xlvDdKEIF+CVwjryC6VXKZk878t+qqYc4i5lqtW99nl0pEe8blMKQxZ0dd0fYxq+GyfN eh74tBe3dCnwTOZtm5sP/H9Dr8UETZ1zPSaDynxbngW96ywZkqAALy5w+WFrNVjF08+B CNz9sqx2Zcf9Cq589K4fjz87HxgN/B4GY18KOf1iY8cvOWgNhrA3ORPFimSAFKt7Qc5V sLEA== 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=3QqEdqH70IxgsAEllZ7tsWRWak8UN0Dpz2tqmapAX+s=; fh=7tclEdh7YbwSQowgJ6LNq720O7H5HTEaqj22NJWRE2E=; b=LduQoDMMQVmWXbLIYb9sfrxCti/pzXNKJ1MkQStVo2+Y0w8U/t+43XwnbTcF09Cgtz yQyRIFEp6XwkBYPsx/zgFn4axRUqt/gXF48geBfwJfyhgCxSMmh2mbdzc9AoOA6GzW+C ZfNIzr35u6nkESidpSt02tZSOPywfBhmK/hxijMJc5AMrcrapKO1VjuFhYHHtzTSDHs3 Tnr3srDyw6LBB16y0mCEF9oo7wSVVCTUbJg9sabm3tl/SGgejo6w/pAGsfHch3OUAIbe 9AxLz4E12yTF56f6XvEodLYN7tSjS7epCkEQOQg5YRy/C0buuQ0IUud/IUA67irLGqb9 HQAQ== 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 u3-20020a17090657c300b009adbab54deesi897024ejr.2.2023.09.26.21.33.23 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 26 Sep 2023 21:33:23 -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 38R4XKXp021959 (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 5/6] user_manual.md: Update minimal host requirements Date: Wed, 27 Sep 2023 06:33:19 +0200 Message-Id: <20230927043320.6264-6-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 Using mmdebstrap requires at least Debian Bullseye on host. Update user manual with the new minimal host distro. Also remove all Buster-related notes. Signed-off-by: Anton Mikanovich --- doc/user_manual.md | 35 ++++++++++++----------------------- 1 file changed, 12 insertions(+), 23 deletions(-) diff --git a/doc/user_manual.md b/doc/user_manual.md index dc7ed4c8..02cb471b 100644 --- a/doc/user_manual.md +++ b/doc/user_manual.md @@ -48,7 +48,7 @@ For demonstration purposes, Isar provides support for the following configurations: - QEMU ARM with Debian Buster - - QEMU ARM64 with Debian Buster (for host >= buster) + - QEMU ARM64 with Debian Buster - QEMU i386 with Debian Buster - QEMU amd64 with Debian Buster - Raspberry Pi various models with Raspberry OS Bullseye @@ -60,7 +60,7 @@ The steps below describe how to build the images provided by default. ### Install Host Tools -The supported host system is >= buster. +The minimal supported host system is Debian Bullseye. Install the following packages: ``` @@ -74,6 +74,7 @@ apt install \ gettext-base \ git \ python3 \ + python3-distutils \ quilt \ qemu-user-static \ reprepro \ @@ -87,28 +88,19 @@ apt install \ zstd ``` -If your host is >= buster, also install the following package. -``` -apt install python3-distutils -``` - -**NOTE:** sbuild version (<=0.78.1) packaged in Debian Buster doesn't support -`$apt_keep_downloaded_packages` option which is required in Isar for -populating `${DL_DIR}/deb`. So, host `sbuild` in this case should be manually -upgraded to >=0.81.2 version from Debian Bullseye. - Next, the user who should run Isar needs to be added to `sbuild` group. ``` sudo gpasswd -a sbuild ``` If you want to generate containerized SDKs, also install the following -packages: `umoci` and `skopeo`. -Umoci is provided by Debian Buster and can be installed with -`apt install umoci`, Skopeo is provided by Debian Bullseye/Unstable and has to -be installed either manually downloading the DEB and installing it (no other -packages required) or with `apt install -t bullseye skopeo` (if -unstable/bullseye included in `/etc/apt/sources.list[.d]`). +packages: + +``` +apt install \ + umoci \ + skopeo +``` Notes: @@ -234,9 +226,6 @@ Variables may be used in `.wks.in` files; Isar will expand them and generate a r In order to run the EFI images with `qemu`, an EFI firmware is required and available at the following address: https://github.com/tianocore/edk2/tree/3858b4a1ff09d3243fea8d07bd135478237cb8f7 -Note that the `ovmf` package in Debian Buster contains a pre-compiled firmware, but doesn't seem to be recent -enough to allow images to be testable under `qemu`. - ``` # AMD64 image, EFI qemu-system-x86_64 -m 256M -nographic -bios edk2/Build/OvmfX64/RELEASE_*/FV/OVMF.fd -hda tmp/deploy/images/qemuamd64/isar-image-base-debian-buster-qemuamd64.wic @@ -963,8 +952,8 @@ put into Isar apt. Debian cross-compilation works out of the box. Currently the following build configurations are supported in Isar: - buster armhf - - buster arm64 (for host >= buster) - - buster mipsel (for host >= buster) + - buster arm64 + - buster mipsel - bullseye armhf - bullseye arm64 - bullseye mipsel From patchwork Wed Sep 27 04:33:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Uladzimir Bely X-Patchwork-Id: 3136 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:33 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-wm1-f62.google.com (mail-wm1-f62.google.com [209.85.128.62]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 38R4XWBS022027 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 27 Sep 2023 06:33:32 +0200 Received: by mail-wm1-f62.google.com with SMTP id 5b1f17b1804b1-40554735995sf74480045e9.1 for ; Tue, 26 Sep 2023 21:33:32 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1695789206; cv=pass; d=google.com; s=arc-20160816; b=eFbT6VKTc2w/+ti6bxciyVqSsCv/pA21aa0GMUOR+fOfdlRr4shJ77HOwU38+90ie5 fbgERLC/jdlmQW4o5UvG/k7pZdYOAjODVoLYv1BDQ4Nbh9A+68PCmJho+W1IYAEqHwEq FlPlffh/F+4nSapaVUxA2jDOAemtMhefdgavdCA4rIGaI78ZBuZGLQy3CuOKWfe58uy/ hXpS06HQe9H3XGfe1m5DRVcO50mva7OOEnQ0PHvyVriAwIeXwXgAXfA/vEwHno+Jp+3t lkO4VZ41AL3ota5rQ39SRxWq01ve1e+KdlgSWvmtQ4yhpS34KVxtpXWYm0rjoOfpGvKX vbEQ== 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=v9xp1JR9S1/RmJGYVbQtiu0CcfRkOQAd3Z3onzGbEec=; fh=7tclEdh7YbwSQowgJ6LNq720O7H5HTEaqj22NJWRE2E=; b=pwO1J/IGFAoBAozw2Fe2qoIeJx21Uxf8RzEiPOnd8ILed1YYJHRIZjT04lRfIK6Pf3 2K6YXeScRvEGxijYhoJXWTrPW1jJsc4PN7U80sDYdyGoFFWsQaviF638JWyLZTAIm3fl iikYZeHBAWBiupQI5T1Zm2UbwNJU9e/xUiqyPYV/EnFw0M88YppjLvrlixSDDS1WHoWT qNshabt9iJBkfnAQEWFLk170R17KDqE7BTqH0+pSA+N808l0XfHmnXWXpMy0Cd8hSTJf Ocu/4Cbvb1O5jXAagL47sq0fZdtcItztn+0FabgHYGdYekvTydc5UGafzjfu6xSsRlUT nEeQ== 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=v9xp1JR9S1/RmJGYVbQtiu0CcfRkOQAd3Z3onzGbEec=; b=HM5RZH/h3POqh75fhWCCLWXlP/TsOAssli/fGDyw2s1v8dO8YI0rO6nJxcxVaJQoyD sl3FLq32veqABygQg4SvAT6lzktgyUfd8kF2t5Uy0p7uywOiTYLhN5EOfkrAPiodlNPd EFxgttkUDm2kB9Dpdkeg+k1xw7q/OSbR30PURNQSHkmYss7yNLSL/3Hb7lT7UERqFOUD A1gcCNWpggMxSujqUvSJ71d5CgudDvjmAzzbjCXEFB9O/GwqGO8X5DFxTMTk76KE5IlX JObbpjPovbP9UQisZI30wxnzIqZFgexSahrHkdmIo1PZeI/lTOJ2A86S4O91XfL7akA+ CtpA== 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=v9xp1JR9S1/RmJGYVbQtiu0CcfRkOQAd3Z3onzGbEec=; b=Z27EMj6qjFnC/noWoyJPsSPtOktMr/k+TGFZzBjcpGsB34C2Yd7n6Tpdhy2GxeS3uk IJ80yn09zFrvQlCHjhk9No2ZSQKWMg2Hzp35oghWY78lQrmEXqJz5y0Dg1r6rd3mB9hD SmC8nV63JgfTalb6ltAMsyTke9AKRatVpsnQhylMe0zW54oLrwaiQZBgAEtYqBvS147V Po8uno6F2u4uPvMOQFZJY4dBbg88WSzt8QvHnEMT/3W4UIZZ+BAPWJPO6UXd2vuXH2VO 1cxbab6lMtlAuCn1MpiU4J4q4+F7nnYd21bFk2FhwLEBPdE9ZvobMehXR4jnEt7HI00G Om3w== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOJu0YzfWoHCMkhJtlbLR95gF6LoVPt9QgfT/7bLIHlS6sSv6XDp0kP0 VkXGb4kqGU+uXszCH0sM6Ec= X-Google-Smtp-Source: AGHT+IFe0bWuFUF7oReZjTpmUng5Bja/4c5qULkMCuIqWdWPfghFXVryS8Ya7l7VWLp3+m7c8laeeA== X-Received: by 2002:a1c:4c11:0:b0:406:4242:e7df with SMTP id z17-20020a1c4c11000000b004064242e7dfmr719719wmf.35.1695789205702; Tue, 26 Sep 2023 21:33:25 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:a0f:b0:404:75cc:62de with SMTP id z15-20020a05600c0a0f00b0040475cc62dels1895003wmp.0.-pod-prod-03-eu; Tue, 26 Sep 2023 21:33:23 -0700 (PDT) X-Received: by 2002:a5d:43ca:0:b0:321:6fe4:d4eb with SMTP id v10-20020a5d43ca000000b003216fe4d4ebmr610330wrr.2.1695789203764; 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=Lj8fgFOGTP9NfEp8Rok6jxKRMZrmmoe4bW4OJXxydyyQcYJftVh1R33pHs45Ri/SIe QAfHUWHkrZ7N/olaS6S3g984flqmxru6lqbs2kNfZ7inRXOKZN8ym5bewA4YfGaAZ0nM JU3rJe43aRVEQiWRdAK6ZPHMViaKqBVBSV3M8fnFjLyF4nsXMOU4/GzbJv44mAEsER/n v8EddfaSG2zncqc8g157QE+1ArxXGAMPU+fqN4mVEjOiw1O1MVjglXgqweYmpfaxnUl6 UZMwGrDySiAcgaD4ZvyDLdr/yJl0EknR8Z/wmWb6IIp0HrLOjDxpmJNEBYBIZHPvDztC 3+vw== 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=fqXph//72FJgprrQdC/3nqFR+mu5BM6+jJqDCICetcA=; fh=7tclEdh7YbwSQowgJ6LNq720O7H5HTEaqj22NJWRE2E=; b=h1uOBix9VGytqfm6Sy+o4m+YZDiuQHfFHkOF7yQOq31mjQlPo5zlopuazYP5hDcx6A 45EjJXiZwjIE/buUytqVsBwtV4SwrR7uJCGt0kdNzOUqR9yYmdXeCtewbQMTCKimWx47 rOtZZd8E5efRKAV7+50jLFKPpMbeg0i4FY2KB9zjMlI9JxHLQoRowTeVEH3+9CnKYIjB 83lx9xZlixuBco1e3elSpYu4INOwk3n5p9m+OVUPtmTueo3S9nc6CSBO+8x3+RNMeNKi JhBF9QV0KNT5+IawSFV0FTwNwQk68iHG5SOB/Gl7/cbjo8KdAhDoii/rCDOnYBuEersO Y32Q== 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 bx30-20020a5d5b1e000000b0031fe51902bdsi989944wrb.0.2023.09.26.21.33.23 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 26 Sep 2023 21:33:23 -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 38R4XKXq021959 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 27 Sep 2023 06:33:23 +0200 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v4 6/6] isar-bootstrap: Remove unused code Date: Wed, 27 Sep 2023 06:33:20 +0200 Message-Id: <20230927043320.6264-7-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 Some external logic like installing gpg and ca-certificates is now doing by mmdebstrap inself. So remove duplications. Signed-off-by: Anton Mikanovich --- .../isar-bootstrap/isar-bootstrap.inc | 26 ------------------- 1 file changed, 26 deletions(-) diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc index cb1fc91a..885428f5 100644 --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc @@ -23,8 +23,6 @@ DISTRO_BOOTSTRAP_KEYFILES = "" THIRD_PARTY_APT_KEYFILES = "" DEPLOY_ISAR_BOOTSTRAP ?= "" DISTRO_BOOTSTRAP_BASE_PACKAGES = "locales,usrmerge" -DISTRO_BOOTSTRAP_BASE_PACKAGES:append:gnupg = ",gnupg" -DISTRO_BOOTSTRAP_BASE_PACKAGES:append:https-support = ",ca-certificates" DISTRO_VARS_PREFIX ?= "${@'HOST_' if d.getVar('BOOTSTRAP_FOR_HOST') == '1' else ''}" BOOTSTRAP_DISTRO = "${@d.getVar('HOST_DISTRO' if d.getVar('BOOTSTRAP_FOR_HOST') == '1' else 'DISTRO')}" BOOTSTRAP_BASE_DISTRO = "${@d.getVar('HOST_BASE_DISTRO' if d.getVar('BOOTSTRAP_FOR_HOST') == '1' else 'BASE_DISTRO')}" @@ -176,30 +174,6 @@ def get_distro_primary_source_entry(d): return source[2:] bb.fatal('Invalid apt sources list') -def get_distro_have_https_source(d): - return any(source[2].startswith("https://") for source in generate_distro_sources(d)) - -def get_distro_needs_https_support(d): - if get_distro_have_https_source(d): - return "https-support" - else: - return "" - -OVERRIDES:append = ":${@get_distro_needs_https_support(d)}" - -def get_distro_needs_gpg_support(d): - if d.getVar("DISTRO_BOOTSTRAP_KEYS") or \ - d.getVar("THIRD_PARTY_APT_KEYS") or \ - d.getVar("BASE_REPO_KEY"): - return "gnupg" - else: - return "" - -OVERRIDES:append = ":${@get_distro_needs_gpg_support(d)}" - -def get_distro_source(d): - return get_distro_primary_source_entry(d)[0] - def get_distro_suite(d): return get_distro_primary_source_entry(d)[1]