From patchwork Thu May 18 09:47:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Mikanovich X-Patchwork-Id: 2811 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Thu, 18 May 2023 11:47:38 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-qk1-f189.google.com (mail-qk1-f189.google.com [209.85.222.189]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 34I9lbWI020490 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 18 May 2023 11:47:38 +0200 Received: by mail-qk1-f189.google.com with SMTP id af79cd13be357-751409fae81sf230177285a.1; Thu, 18 May 2023 02:47:37 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1684403251; cv=pass; d=google.com; s=arc-20160816; b=wgQrDBWKR8GoZBKq4hD4F029aI/ffuwmwPjwPY7ODvvhB6pBNHpBH/F/iwXQTlWzxR liGbL/+u41tOQ5nXdkUTLJ/39tWV6+Or40Xlmj3db87W7n8fvAJZWMLtyRWZ3nP+hdh3 qdWgsO2HaZKbmtiVEusQsLUejGZx+Nz14LLETGCzbdLsnnbLIQ+03Zf2fVQZzXhkoebD sEDv48OYHYELdrGxIPzk1oNCBqWsDBPscmRaYb+9PBcToNy9eiQdKiPoufqC6YWPtOZ/ +9srInKz6Uje+hAaz54pGdyuysT+ThkAg9ReNah7C9gRLZS4WFGX1uqL2YbhUL85Ht3N VGYg== 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:cc:to:from:sender:dkim-signature; bh=RcBU0dArOAZ0ok7Vse+fDJCvml/PIu0X4uxEb3QDTck=; b=ybRJCCEr4eDRTkKgyAFwreMga6ka5PYC0SLfcRDt9NxqctTd3fGF2+K4/vjXO7ogdY DyVF5yQ9QI6PplBI8I+2fh8R5EIu6mYo2tWJrN7CjhgdYiqJrds5q3R/z63CQnn+wnQz HGVMnLlwCFYW32G7rziQaSoK7LAi0af3xlVPOdGd3MMvCOwYq5NVUzvmMiCts2eEW1md GZGbnszTEznFIOXqSuCwYLOyvE7Fgckw8V1ZsJMk7WzosfEjNnONxBhVtWUcMdD1LKX2 LoYYtV3LD6GxppVyqWm8GBBHSTHyCuO8ULE2B8mVTTGi6o9AMtESX2yZEPZsvfzNAs06 vt2g== ARC-Authentication-Results: i=2; 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20221208; t=1684403251; x=1686995251; 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:cc:to:from:sender:from:to:cc:subject:date:message-id :reply-to; bh=RcBU0dArOAZ0ok7Vse+fDJCvml/PIu0X4uxEb3QDTck=; b=cD4C3PaQGxFq3jalC4N0F7giHcp4u0oaDJDje0p17uNQ+WDIerw4YKfUP5QUuhScJb s34honhKCm9vOHrmAZa8dgROUECb5W12SphgPFI9UT28FzR4X+siOepIUj95v1jM6TXd ZRU9FNev5d5s8v9wVv4U2UEwHcCOoSQnf1Ga70YBnZ/KWbFMeAZsFsZ7rjMHb8KE6k5I hRwE3t18fOIQEh+4FgTFF85nUpDKJVDHUyw5KN+4gR9knB3qQwcQyji5bLMdsfkZtMfP yIkUDEgaMctnhoME9woTSGRWupL2Qufkv4Sx09PHVy2/4rB7/Xgp6yZyKmC+GzTi3+90 VLHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684403251; x=1686995251; 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:cc:to:from :x-beenthere:x-gm-message-state:sender:from:to:cc:subject:date :message-id:reply-to; bh=RcBU0dArOAZ0ok7Vse+fDJCvml/PIu0X4uxEb3QDTck=; b=XOLJUlF2kg+d1swbLufj4swBvaCHhxj2hofh7zGNWd/+dsP7/DjCiWcpcoXH+F3A31 KOxH3WdE57jYD+RBdPTDyNS+pEfOssOIt4gXRB5DfBRsaP5W9LAhSZvql8bA3cJTEIRG PS8XuGtMPPP8q7IgXs5oVXk/hkC7Qsw7dtqI9e66GGSLRIIleH8Sze16KlCHkMAOIOwk dZYKgqZxAWiKdLWmnXnytUcISylAJvHSNYZpnJQaSKOyLt9+WGwRacMAhn3OSL253Ki2 /lN9tuplaZIPg8Ae3W5ppMiWxEhNAj+mjEQTXr0Hu1eJ/Jhi4Gjds5UEFZSxQASWM3RW yYgQ== Sender: isar-users@googlegroups.com X-Gm-Message-State: AC+VfDzn/CIbXQMKIVadtUKVkfbKhnSLKy+KkJi+Tl094JaxyCPwmop/ RcIjz5J6KjFFmjBL48hygFW0sg== X-Google-Smtp-Source: ACHHUZ6dXnJj3dR5u9Rj2F14PsWs+u2MtVplJJrqq05x4X+wbcfx++TTsAt2bpLkwxtgHziA0ZZxHA== X-Received: by 2002:a05:620a:4686:b0:759:3ed1:a847 with SMTP id bq6-20020a05620a468600b007593ed1a847mr1046232qkb.9.1684403251612; Thu, 18 May 2023 02:47:31 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ac8:4a02:0:b0:3ef:573b:68e1 with SMTP id x2-20020ac84a02000000b003ef573b68e1ls1252073qtq.0.-pod-prod-05-us; Thu, 18 May 2023 02:47:31 -0700 (PDT) X-Received: by 2002:a1f:3dd1:0:b0:456:e5d3:4161 with SMTP id k200-20020a1f3dd1000000b00456e5d34161mr250191vka.1.1684403251047; Thu, 18 May 2023 02:47:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684403251; cv=none; d=google.com; s=arc-20160816; b=r2fadtiAM/S6hROwUzx/rUMWFnwVZLUIwOr7SYDTL96cjaUgf+J27c8aKitCEOo3/G lDH3Tk3dlAU2SNVPghtJnj8ehLapaBrfCAjNJN7SUWLeuVIyQPvZtXav6936MjvnZrAk 8keuQV/cbSAzT7EgxFWQRvgzkchKzZcmy+xqsiwZE/3R1Nvwv/BIphT29dzzjLCW65sM icSK0POV7gUVHpShqHGE0F7OAAHumLHynrmiUll0q7AVZt6kCWYR6sekRoUwk0Cg7JFR NrFsZf/aOGuEmFuLTj6nEMarp5Ogw26JBuHzYKvfk11pQLsrT0e1fe89RbGGXmJv7Sfr u4FA== 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=2C9U9OzP/jFakvpFxylUz7Rq6ZTJctOzb4lyGL6n8p8=; b=yfO3kc8ZCOCAf9r0scWi/lvrP6tq/heVmswBJhHa7cRs7E/3ezp5bxqt5jaUdO1Opv 73vkZpTm3/wSXXm6nP6+a0ZgPlnYCQe65f/HtzteO0ZKmw1r0Ag4hvxlI9mRngSpMa5y TE29pYP3VP9zuAq2VPeUWVs/4dcVHrTuTmkDAuxzVIcJ2q8yMOSuKNYtTbdiOC8L7+HC sTyaTLrOYPxvAN7Yq62I+GQnkW9akDUDtnHIQ0lwNR01R+Q0d1V/TF1kqaD8hov4aJ3U tP9Ba51woseZUyQjxX5PIhbgQeE0yCw0N3xXfzVHhn5MF9aYLkhEosiJHZIYvDC1np5G vCug== 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 Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id y197-20020a1f7dce000000b00456d8fcc97csi115928vkc.2.2023.05.18.02.47.29 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 18 May 2023 02:47:30 -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; Received: from user-B660.. ([85.254.74.3]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 34I9lM4R020451 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 18 May 2023 11:47:24 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Uladzimir Bely , Anton Mikanovich Subject: [PATCH v2 1/6] meta: Switch to mmdebstrap Date: Thu, 18 May 2023 12:47:11 +0300 Message-Id: <20230518094716.117770-2-amikan@ilbers.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230518094716.117770-1-amikan@ilbers.de> References: <20230518094716.117770-1-amikan@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: amikan@ilbers.de X-Original-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 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: Uladzimir Bely 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-focal.conf | 4 -- .../isar-bootstrap/isar-bootstrap.inc | 57 ++++++++++--------- 2 files changed, 30 insertions(+), 31 deletions(-) diff --git a/meta-isar/conf/distro/ubuntu-focal.conf b/meta-isar/conf/distro/ubuntu-focal.conf index 0cb6958d..be8c951c 100644 --- a/meta-isar/conf/distro/ubuntu-focal.conf +++ b/meta-isar/conf/distro/ubuntu-focal.conf @@ -17,10 +17,6 @@ BOOTSTRAP_KEY = "file://${LAYERDIR_isar}/conf/distro/ubuntu.public.key;sha256sum DISTRO_BOOTSTRAP_KEYS += "${BOOTSTRAP_KEY}" HOST_DISTRO_BOOTSTRAP_KEYS += "${BOOTSTRAP_KEY}" - -# 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 b94ae0bd..f89c284e 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 @@ -270,7 +272,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}" @@ -286,27 +288,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" @@ -409,19 +415,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 Thu May 18 09:47:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Mikanovich X-Patchwork-Id: 2812 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Thu, 18 May 2023 11:47:39 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-il1-f189.google.com (mail-il1-f189.google.com [209.85.166.189]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 34I9lcVS020495 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 18 May 2023 11:47:38 +0200 Received: by mail-il1-f189.google.com with SMTP id e9e14a558f8ab-3381de222c3sf12742885ab.2; Thu, 18 May 2023 02:47:38 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1684403252; cv=pass; d=google.com; s=arc-20160816; b=QOgSILRTYhHAbi4yRM+kHat1UgWBlyXqB0nbr9CtEUnUXNfRRO9+xfH4e+tyor3RAL yWzcBF+U0zU9ldTeXGk06mv1BhPUuuv/rUK6xulxl9RuC7LeW7lz7+sxcxavKJdLkkWL GoJN61/SzTGoayaZxalGyy+2zqBeX6U11yFn9l9tesvgI/EoP1mAzY/sw3eLjfL8nrkx EBZTmXOXL2VSOsAUxGrz3/41jX7beWhGrm6reQLncCxNTNxtK2Lk4jPmxjvZmxI/FU2x b0m8Q9XMgc5ogZHf7pjTq5iz+/OmUMJsy/IohjTnsmrLk7i7gx2A88pzwyY++wvoxNiN GOiQ== 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:cc:to:from:sender:dkim-signature; bh=5JENY6f4N6f3/v6SuscprLuICjIGwll8O4t2ZaYymrg=; b=a0EY8MQo8VR78vzmrmADwQ0A7ALhw40waducWZRaG2qntSPI7D1SCbwfmeKgvl5u95 CvGEupllGNv7dKTnsgWIAVJ7DFBJthoVYuuTZlWdD/rMqdxwk8VRBBV152X414XlivwZ sNF25yjbYA8JnaXt9FHc6oeG9Ib4t8cc1nKv1dHSOlC5w8Hmn1Z2n7G+klbDY7RIMcUL KEWZlqX57FTgLl1jofNBtdJX8qlEhBxW/p3uDz+/0/bHTpiVNv6QRQUq9HlVyXdkjZUl MFAjKNtBa7Nu7Rl8HuLrTUujrm8ufqM3VwdVaWDDG9B5CM87CJx2h1BB3qjw/AQ2LRlA zN5g== ARC-Authentication-Results: i=2; 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20221208; t=1684403252; x=1686995252; 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:cc:to:from:sender:from:to:cc:subject:date:message-id :reply-to; bh=5JENY6f4N6f3/v6SuscprLuICjIGwll8O4t2ZaYymrg=; b=PoQeI3kBB4o5LjsKDeeR1kG32pQNBqUSFCz41xDlyv4ybX8tucdr5fwSZ0MmKYt5w0 AjpgjlUDnxEJjCdbWTNgzSgzb12G6aRk7CreJ3vOEB8moYHFOE7AlI4tPVb3881dBaiG fzE/h8AwLG2m2K4Nyh7rnT1SPLpSj7XZsmoHVTCWERIRNUeFeKPo2o2M2+/iE65TjeI/ DXwdxscHA6HzggaZXxllmimi/Vl2ug8Hn+BIaqVAKtoX3APUT+M/+6INogpQ6WwReOvM 5Q42eSenmufW0LDf4+VtlHQTk0ytrXF9dE+SjZHvDntP6TvmTH8PB8NzXpTq7ELZPLVk cRHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684403252; x=1686995252; 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:cc:to:from :x-beenthere:x-gm-message-state:sender:from:to:cc:subject:date :message-id:reply-to; bh=5JENY6f4N6f3/v6SuscprLuICjIGwll8O4t2ZaYymrg=; b=NCRrYRMdInBEWMZi0TGL62lJ3IFQXwzc47y3Le/6RQlxlmiRgmb+jIid2vLNIpo5sd I6vn3cWcUJT9mvn8kXJM+c1Hnqz+8apdbKrQRjV68lHut5Da/A+4SmeeWv7RGunVMf1F jy6W7j/dhYle9IyrMrTxvlQZP/Ctz7wQrNXswB9ZijCV1jMTEpw3WYKWhRV4QekSHMWD XduzeiAfU4epCWpIMWVUnM2MIdU78XRfLTdB+ba/n+uwge/U7fyJJaL8u7bnZrlyl7ls vDSKOsX3WYzvheAAa1vGyh6i+hla3yWy9c9lgrQGZT5FKn0URoGQ+Oo7U1ZUP0vwbq4W zaAw== Sender: isar-users@googlegroups.com X-Gm-Message-State: AC+VfDwFugbDyOos+9wqoPAoEUlwQ8726FgzAoYV8pqjcjsBPHGecz6P nqCG26EOaY95hfcKzbnBuX8= X-Google-Smtp-Source: ACHHUZ7krqR4f5EZ2uUZlUBPtgFVaLd2bo6AINBOG2kSaiVt4zxx/b3BScrYxPDVfB+CrFzo4H9+6w== X-Received: by 2002:a92:d70e:0:b0:335:de72:23cd with SMTP id m14-20020a92d70e000000b00335de7223cdmr2838094iln.4.1684403252490; Thu, 18 May 2023 02:47:32 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6e02:1085:b0:332:70c1:2b3c with SMTP id r5-20020a056e02108500b0033270c12b3cls404239ilj.1.-pod-prod-00-us; Thu, 18 May 2023 02:47:32 -0700 (PDT) X-Received: by 2002:a5e:c117:0:b0:76c:7954:35c with SMTP id v23-20020a5ec117000000b0076c7954035cmr3660150iol.4.1684403252062; Thu, 18 May 2023 02:47:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684403252; cv=none; d=google.com; s=arc-20160816; b=LzVrI1j6noHA1ibI7v1fvsF37tFRA6n+ysvuaQHWlltxrMuwXCISLRzrbb2mdEuKzv cwJ/NJMTx1bqGUgkF+ItJY11zIQ7kUaGPFFWM1a5mL3h0L8eEwBLAK5WBSt0nDNsUO+Y ep2ruCzJvGrnwy5lAzOV6DzY8qbinAFdDsJh94QEeLIDgcWlOck9Ccf4MrW+xfNBSyvv mrLQKrBW0svWzAZW7STaZ7zknUSVJqy07OX2Fsb3yxQ/bLlpfBwFPyVrOxhWmKxgx44n 9ITUSFEhI4gi1oup2xPYNWaybabv2eZvfE4opfRdVB0afi0A5bMRg+N48PXlNUFXeX0T Z22A== 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=T/jVWo+F+jIoaY4rWEJD1Kf11GCdgYyLV6jhozx+Q3w=; b=PCu6vLGge/6f6P/3kDtgkB4vMqiybyNkuMDPLpDPc5EScM2ZQuHs6W+zC9l1c8nB6B Mfb+75+xqDjcHISp3Sldm3+CwveSEAORp7D/bkSUzPXm2op4N16ex3sRkBwi1wQi/uoJ axp0xrvu3w5VPEphTeIqDn4yuIMQmKWqyjwd9IaxoaD32+V+TYP7L1PpgWeBuzoYKF9t GHf6p7NBFcKiHCW1esEpyntpr6XkADcRkCmmaBmG/1V8lJNvSQn+O2p8dB9Jdlu7r/K0 Lk1n9IKefE2WxKh4GifHdmGiD2ej3IyXUYrn6dqefFLKy1o+J58vKOPCW7VbnWZvWjFz NeEA== 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 Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id g5-20020a056602150500b0077006b0ddb6si96364iow.3.2023.05.18.02.47.30 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 18 May 2023 02:47:31 -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; Received: from user-B660.. ([85.254.74.3]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 34I9lM4S020451 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 18 May 2023 11:47:25 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v2 2/6] isar-bootstrap: Move preparations to hooks Date: Thu, 18 May 2023 12:47:12 +0300 Message-Id: <20230518094716.117770-3-amikan@ilbers.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230518094716.117770-1-amikan@ilbers.de> References: <20230518094716.117770-1-amikan@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: amikan@ilbers.de X-Original-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 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?= 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 f89c284e..fba876ea 100644 --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc @@ -212,24 +212,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 } @@ -272,12 +269,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 @@ -287,124 +286,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 Thu May 18 09:47:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Mikanovich X-Patchwork-Id: 2813 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Thu, 18 May 2023 11:47:40 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-qv1-f60.google.com (mail-qv1-f60.google.com [209.85.219.60]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 34I9lcNW020496 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 18 May 2023 11:47:39 +0200 Received: by mail-qv1-f60.google.com with SMTP id 6a1803df08f44-6238c64280fsf16740856d6.2; Thu, 18 May 2023 02:47:39 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1684403253; cv=pass; d=google.com; s=arc-20160816; b=LmPN9ArPIS7IgMtncsdvj9DndU6LXSglv0v3jGhJCN9THh8w6p3uHCdJvSEVkwuELZ 998/x3J8c8mMPxLF/op72SGPvxWGvKr2UBqyAwXE9vjxIiH3xySDwd91MTk2vdwciTvR jQIsvdrQeKsVyefBLBfpsIpSkWu6139yJCBCNN5+5bhJnVM7VJWz+NvCY2/eDtYFIyfL tRSZLCnq96oUzLIs7CJ3xs2tN4PKlc0sUIabZD9PIaKAU9TT9x6Twg9iJpiCRXTmfdv7 J0GTfQFnD1+lznLMP/brWKVT9TPCM+mY+HHNReDsIzg2hi60TzThgLyUnv69DwW4z2ko wkNA== 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:cc:to:from:sender:dkim-signature; bh=2upI6A/hV/JE7TMFkRlsh6fVf9tbgyW0B4zBlZJuPCM=; b=Mlw9lbZqyjf8BoecGqbmuc/fnGzPYyoNOUtJCs5QmpAqW7p2AQ+gE9LXggKzgVcdg9 zkQ14AQs3s4ZWJ5kmXiP0fdhim7XE+k4Roy0dtwcNBqGaEqRxWjxerbmq9KQVIMWjcV1 RN+13hl+C3u/HlOG6HDAa5zFhKNkWU5l56btFMd0w9+cN3p3k4c4mRDpzNDur2I/j9IY I+BZkCU2YqUjAGSUKUky/9SvWbv+g6TZAjgoX5kJNZ5RcjH/mLDbgGNtBFyQej9FQa/s CYhs1yK7jAABEn1Z+TvuJbW1jPGGyEFp0eaL8Qf4MIMRqoCJFzmvQ2OvA+aDnUygHxyS ohXw== ARC-Authentication-Results: i=2; 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20221208; t=1684403253; x=1686995253; 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:cc:to:from:sender:from:to:cc:subject:date:message-id :reply-to; bh=2upI6A/hV/JE7TMFkRlsh6fVf9tbgyW0B4zBlZJuPCM=; b=nFNgna4h9/dnR1ejH3N86TdGgrUmAM9s0zxveyYawLyRKlUhDlXNvd7B70Qaj8lVxq g6Rb4PFHOAF2y08RDZNpnqX+swfh6coMZ/Pswz6y03GAwqiw3x4+6c5shHEWg8VpawaM 3sRZ0gub7upzQcRAx18m9W01AsPutbgc/i7nHSBjLcnwaNjDxXapyG9DFLlKsTf/zVte yuHcYzZUKtgx7O1MiRPYAuLJ+1Fs7G5wFjflHnKESEuuBuYe7Xa3Sr3dmWTF/uJnwudg 7gDKoKZ7n/yjThgFhWcRPyQ1wGDmtckN2ttl/B8Q+cXJ2/AkjcoTkNqGvkLJc4wEB9KE XawQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684403253; x=1686995253; 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:cc:to:from :x-beenthere:x-gm-message-state:sender:from:to:cc:subject:date :message-id:reply-to; bh=2upI6A/hV/JE7TMFkRlsh6fVf9tbgyW0B4zBlZJuPCM=; b=K6yW3pGwbehM1nhGScLoYjmZUZsLthekWnV8cgJVD/kZut/gzCfYkB9YPJkZK1Y6LI YB8fDadTPVoGoWWwqD45hfu/vL3phkIQpSr9J+jFn5cYumEWgUgUaU280vpWVLxGFhDc EhIYPu2tMleedV52DFKSvwG2SdSJtempey/vQMCS4V3FK0l2lQqWNs3lEGTCYX963+Pl /pTzU9TQoHM84dJLXtFSNLjQYkshcX6hFhnM0gp11V8niIWjeOUzRpYDZyjP4Qr3+FOy EwfIAyCsnENMpiW8vQLlBSjJhgMVFZw5zVri8S0jrsrH1AVPQk3P21eqSrkSj9rhZKvQ sUSw== Sender: isar-users@googlegroups.com X-Gm-Message-State: AC+VfDx5K5ZmJ69lf5SMlK0+XfDmsYdBGGeLH7w++/ryCwCOGLQnLroC mRo6wK7CB0z5KdAtbmwdQqk= X-Google-Smtp-Source: ACHHUZ5ac2+aOhRm5h+CmFVzCrhhnNatXVipSUNgtMo237MgAtUTfuBeyuPooVRr1LYfIifMVEGxjw== X-Received: by 2002:ad4:55e3:0:b0:623:89db:3ed0 with SMTP id bu3-20020ad455e3000000b0062389db3ed0mr570693qvb.10.1684403253325; Thu, 18 May 2023 02:47:33 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ac8:4a02:0:b0:3ef:573b:68e1 with SMTP id x2-20020ac84a02000000b003ef573b68e1ls1252125qtq.0.-pod-prod-05-us; Thu, 18 May 2023 02:47:33 -0700 (PDT) X-Received: by 2002:a1f:bf57:0:b0:43f:9aaf:b629 with SMTP id p84-20020a1fbf57000000b0043f9aafb629mr395416vkf.0.1684403252930; Thu, 18 May 2023 02:47:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684403252; cv=none; d=google.com; s=arc-20160816; b=M1jLd3r//UJSCVgftw2oDzcH/Jhkn+97yN3mrGEZfz3FbOCmgymZfovJAybwQi5vaL vIpCuq9FRFgGsEwPytXjLrYg9NHmjSb3H4WbEgWY7jc7yhBFMfNAcXY7j2UYPvu8CjHp 35Q1bobFXeLZU3wr4YN1D2GA4rDvV1Ovj7o/4qU1lqqBXuGaIDEhZtq3gN6Ly62pd16V cBt4XuxSbTutBAu9eG9g0ckgDHltLeXL+QY6ZjNfGPgvwIegIeSIT5Kr+DXDR3yiBg9i O/2FL+4N3/m1fIT7Zb3ENuIr8Ce10y7YB7bmmGiBIS16kqzT9dP2Dc1raU8rkRIoTXdp 2VSA== 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=UVf2ejA6KJMzz8enUy/kj98uNmJqz2lP5Y6NxRgCdnY=; b=Dh7JpM507WIliElblLp6ZV5kd6SkCImoSuIsSpcxByHlCJz8UDdgPoRCF7oNs4HoB+ 1InqWuHml0jQi4iRSbJlTOpKm5T6W9sL0bAcq/Un1U/2zOZfq+iyq3ozmV3smQMCnnAh aRQ9oAtEZ4wXQdT8G4ghjJh9ICn/ow5jjTLvHYMdSR10oNxX/ZtAhtiKH/ChzR7wLPab 46M6o2kyCmm+fgBDImLYZVV9rB8EsFYkxNUxdmV1xos6TJwS26tA2e4ILxbIGJZK9RHs qTsGTSGrCq9hA60fwp/zGwQFS6Wnf9BBMdmsG+w4J9prS2pDkIv96WS1I3l34eIfGVbr vl+g== 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 Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id l38-20020a056122202600b004401f15502esi77342vkd.1.2023.05.18.02.47.31 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 18 May 2023 02:47:32 -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; Received: from user-B660.. ([85.254.74.3]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 34I9lM4T020451 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 18 May 2023 11:47:26 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v2 3/6] isar-bootstrap: Use tar output instead of directory Date: Thu, 18 May 2023 12:47:13 +0300 Message-Id: <20230518094716.117770-4-amikan@ilbers.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230518094716.117770-1-amikan@ilbers.de> References: <20230518094716.117770-1-amikan@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: amikan@ilbers.de X-Original-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 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?= 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 22449d71..29d5fd53 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 fba876ea..2aeceb58 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" @@ -290,9 +289,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" @@ -397,18 +393,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" @@ -423,15 +410,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 Thu May 18 09:47:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Mikanovich X-Patchwork-Id: 2814 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Thu, 18 May 2023 11:47:41 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-yw1-f192.google.com (mail-yw1-f192.google.com [209.85.128.192]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 34I9ldbr020499 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 18 May 2023 11:47:40 +0200 Received: by mail-yw1-f192.google.com with SMTP id 00721157ae682-561abf855afsf19444807b3.2; Thu, 18 May 2023 02:47:40 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1684403254; cv=pass; d=google.com; s=arc-20160816; b=hBw5GFT5fuil6OP3u22hIoPQ8oZJnXi3TDCfQIE1eLMMtRJtb5qv7qEAdvgnaUhraM mePIhUTcjMTjxOFo/0z9HgnbF8my91th43sP4lMxWDz8eswcvbNj4LirfAinDRnOeFco P4spow0BYMtzBoJYIRhKqwNIcf/oSiIPk+48XnKYDv732kRNrT5F3wNqOJYAGQBbCRRX EMSIwEqwTdLRim4SaZYgNQ9yeRv9jsIGeS7dL3VCukZ5SQA5ThI7cEXvKlG8UKn56K7Q wWgpg4+h6Y1zcI6GZo1KB5uEIAfgj/8RcI2GOVam0Mliv8WweJKvPH9xeQPTkg/tlR4p PIwg== 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:cc:to:from:sender:dkim-signature; bh=EVI32f1iQwh1ZcXrTmlVN3dwA/Np8oMzvIcybidSoK8=; b=JhJoo31GzCHhUsa9sDoYeSbi08AtTJU4pRqUeyZap87ACy4nAo4nxJsPm78taHSdNk GDRjIqegn9qPQfneQT6IOhIf4JGlhVas2tP+34aqQgq8zAjEe4hqsCEo3Ete271Hctvy ZoAwBgj2F11p7ZjkNPfU1VHKcCnG0Ow9YNzAVAzyaEy73EMJFvkOLCJ51fPHLG7YGCSG 2lfS4MyODfz+1t0I9d7OErCkDgY6FKQucP4O/hqPzaDeUB8y0RLcVUwOjiXIbP32j944 otmZoloOVaE6ZfXgM4PO4KTJKCX5CDNfn7ZyGjJcM8e/0WA8tk3jcULTwEWvCymyo9wn Dkag== ARC-Authentication-Results: i=2; 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20221208; t=1684403254; x=1686995254; 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:cc:to:from:sender:from:to:cc:subject:date:message-id :reply-to; bh=EVI32f1iQwh1ZcXrTmlVN3dwA/Np8oMzvIcybidSoK8=; b=UEhgem/lb8JYF+jmKk/OmqSCSTrrakZQJnGlSNC9C10qxUdRApod57e36+l9JhrJXS ydh1IPD2MWabTdCOgJD39GCL08C1SxsrGO/nUgivZZSVxWNpyQloirlt1xQgzGeBtHHi fgBG9m9MFUBALemO1lVA3LpcvwwbfJsmUWj8HaYwX82OzL1BkuQMbnT/7svKsg/eTazo Na2JAgG7Tu+UF1aCyNcS/b8ervsCIckpYCgcGaJ80/cou5k+GpUIfskByCWHi6lrMrck Mg2bx3D3obqejctLsBKx6imghQQq/aG02lAru75paUjxgVd+w6AgRuGg36I85gxPUaIt 2D6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684403254; x=1686995254; 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:cc:to:from :x-beenthere:x-gm-message-state:sender:from:to:cc:subject:date :message-id:reply-to; bh=EVI32f1iQwh1ZcXrTmlVN3dwA/Np8oMzvIcybidSoK8=; b=fB+XfFtG1tAwuHXoQX1Cv51Z4aQecJc0Y/idz1VZHf2kDIabCzhIOgWsQIOJX43WiC 3PGV9WuyKfJKwP6GEHvYMYNOvMeewdFKOIvGdLMusOWW+SeK+v6CXRtEiGJ93NVlOvu1 cTwO5h+pjfxzVn+qpgTK+woTd8+RX8NhToiXt+rir2QNaxk0+sA2jrihHwnBkAJNYqfB 7OmNzI9+cKTxNFz7nDP+82aEybuaKfhtQpVcmamo8PvV9hh+PKwaT61uP1q4fQ7Ya5H2 stdM4zyFXaAtffyg/mu+rmaB4a2YbmdyLIGQ7/N1oJ20DNft0R/rWi7nKFytd92sb8Im AaJA== Sender: isar-users@googlegroups.com X-Gm-Message-State: AC+VfDzhoOsTINg8wowfhuGLmWPBCrrPCl4tfHhxGu47R4AXcQ/CeGeR EdMbePClnNAV+5xW6gKiEe4= X-Google-Smtp-Source: ACHHUZ6bhb6A9h0bqG9/Wj8YWUcbnQdLLNP459HKg8JyHjkRh11TLv81vFEieuOgzNr9nPaqrhtzjQ== X-Received: by 2002:a81:ac4b:0:b0:561:8ff6:fb5b with SMTP id z11-20020a81ac4b000000b005618ff6fb5bmr660494ywj.10.1684403254337; Thu, 18 May 2023 02:47:34 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a25:378d:0:b0:ba8:25f2:dff1 with SMTP id e135-20020a25378d000000b00ba825f2dff1ls647085yba.0.-pod-prod-07-us; Thu, 18 May 2023 02:47:33 -0700 (PDT) X-Received: by 2002:a0d:cb8b:0:b0:561:a7d9:7f0f with SMTP id n133-20020a0dcb8b000000b00561a7d97f0fmr817903ywd.29.1684403253766; Thu, 18 May 2023 02:47:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684403253; cv=none; d=google.com; s=arc-20160816; b=yrFGBm9aWYb5HVKqAsfWpmYqgBL9aV5xNJN6iPTWR76eUITfT6H4dJDkizr0PWmO/w Sa/ztl484haoqlKiPjtxm53GOkzCYufUG4T4oKf9hfBEOitYhsOaKcIIqB9DyZtY9p1Z At3b+sdCxn7lOfOzeaitwWnJ364dt6G+dgi3Ug/ESFmo/LJe96sJ1KiCXDGIhpcnp8vu 4QU+VGq3EDxdWyTrZBkHjTdMFENQhBES92s3BMOGBWggilcuuHzQO32nm2WAXOAXhT3b J5d+pkbgbMSh3sGbv3YVkeynJJlUHN0tk0D+8wj2TCtlVBwOf9T/waJ6tCBJEm8fsr0C 97AA== 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=+CfeYl3FQo3l+KmpZoaCj4nDytR3NOXpq5N6c50SBa4=; b=BjntC5gTgMmNAxkHEiN9LDigk4L110fqmxXpigjfQECIQtDdz4yCGYkVGG6kYyxaGa YCRO7uSFpQ+6hR28tm3kNcmNJgw/RXp/7Ra3+RMyw7tAWGexWOXWfI+gb9Q694R3i2oT cYB8WRQZ3uUfbnHX2QEOQ9CfPK57KHR+p81ZP3r900rSNQJWwn6FC3Y1cS91pvKm9hP9 bRZDElmOJ4reJtmZQO7TDFz1KhXHs2IRYwMcdGHzk6X0/1/Wn7JdTaQzThb1RTqx0JjM sTVColgkTtjM0HGISKGXij81h30ABGDYRE+6RWWUR3+Jgvd7Nmf7Y16SwyZqhgtEnd/n tfYw== 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 Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id cg4-20020a05690c0a0400b0055a5a7bcedcsi41401ywb.3.2023.05.18.02.47.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 18 May 2023 02:47:33 -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; Received: from user-B660.. ([85.254.74.3]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 34I9lM4U020451 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 18 May 2023 11:47:27 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v2 4/6] user_manual.md: Replace debootstrap with mmdebstrap Date: Thu, 18 May 2023 12:47:14 +0300 Message-Id: <20230518094716.117770-5-amikan@ilbers.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230518094716.117770-1-amikan@ilbers.de> References: <20230518094716.117770-1-amikan@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,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: amikan@ilbers.de X-Original-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 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?= --- 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 60b7ca92..999cbd8b 100644 --- a/doc/user_manual.md +++ b/doc/user_manual.md @@ -65,7 +65,9 @@ Install the following packages: apt install \ binfmt-support \ bzip2 \ - debootstrap \ + mmdebstrap \ + arch-test \ + apt-utils \ dosfstools \ dpkg-dev \ gettext-base \ @@ -128,7 +130,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 Thu May 18 09:47:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Mikanovich X-Patchwork-Id: 2815 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Thu, 18 May 2023 11:47:41 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-qv1-f61.google.com (mail-qv1-f61.google.com [209.85.219.61]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 34I9leaB020502 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 18 May 2023 11:47:41 +0200 Received: by mail-qv1-f61.google.com with SMTP id 6a1803df08f44-62381540ab8sf6704636d6.1; Thu, 18 May 2023 02:47:41 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1684403255; cv=pass; d=google.com; s=arc-20160816; b=Y+PPN86PjCMshxqr+KuPcbqvGfxHh4xjgurf80jLtoHewBIjrsDneFP5kG8BdHX54E Nm9EVIpQy7t137ZMqYClGG7O7okEHhBErEd3MSmS4JoP7x9asm3ep0Ha4oiBffs1ojPG 1CWZJM/NCzelSmL7huEkoVvNM1n6MF206iAlf7Ip9Z/nqbS4Mmqz9GBQ/MLCPr/l4lvH 4bPUmLseDSlAf3DfTS7SVLgas1dlOWIJseiGDJbPnmTPekBncD9pR8jlVNBr6IZUsbvt O8LELmo/jcQSbd9Q/2JeX2jXbDbeHdrCKZeVnMn8NznkuVnwL6y55pav1+KX+RviKBWr 3NUQ== 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:cc:to:from:sender:dkim-signature; bh=z5uZj2bpgZYTxhLYbAQMBpMnRmSNcbSmmTLqj5jFhRg=; b=ovQCj802S4GpulUN49188cN1XimnDfOJb2d+nCKERwB8W/NKKdv4vXSIVzbNjV9Zut Y3/Ee8BdS+pyHkCzenUDrKOS1C8dO8IE2c+9TkCTyQtAfxPpgQMJ/zqWq/kivEsMd5fv pw7UZltu9x1EKNY9SNt2m0KCDP6AOxXEQl4jP5qjhW8oikHesDb/G1cxOyMuH2oCqb0o RVYurgWK8uOKESHI1zNAyDNnjyX4joBEmgog+HuJUN56wpbRDkSIMsLNLiGoqzojq8mi xCT0sVeYePJcbfGMMS1joP+U6c+BVVHZsS4ZC22GjK7goKX0jfz6r9ZBgVBx9M4b+V0Y pIng== ARC-Authentication-Results: i=2; 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20221208; t=1684403255; x=1686995255; 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:cc:to:from:sender:from:to:cc:subject:date:message-id :reply-to; bh=z5uZj2bpgZYTxhLYbAQMBpMnRmSNcbSmmTLqj5jFhRg=; b=LR+woXbN8LnL+P3OrJs0pBrS1Dzr/ZaDRBJhTP3ZnA82DQh2wclWcjZYtSWuxL+641 ynbX3zoXdyTaeV3PL2jSFk5TjZCOIhAi+HtUuoNTWDZ9yDBHJ9MwjbaVkhk/Jlx7y+li 0qnWjteVFvFmF/iD3/dgPdlVp5WWAjYVrHB2AEIXlXmLdjhn9Ol66DEiLfsk25ppma3A L4wMH8etRu4rD3l3GhRu5OWGVy2yvg3TsIjixIJFsX8kq7yan8WPOwU9e9VivnGvcDTF Y/YXBLHVwoudznFJJGZ+xdW9M43DBPx4Tqxmc/fYlpkcZZw/qCKC6XA6A2QdrNqBNY3q Idcw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684403255; x=1686995255; 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:cc:to:from :x-beenthere:x-gm-message-state:sender:from:to:cc:subject:date :message-id:reply-to; bh=z5uZj2bpgZYTxhLYbAQMBpMnRmSNcbSmmTLqj5jFhRg=; b=cHB2lryOy2yUP1hBJetopFmGH2jkN2BKh0dXWohf0FaDV3A2pOnVKJhW7iL5SuZJ8j u3K7+4Il9Q3tDm5zEf38vVPxC2Y8k3l4slg+UX3zJpNTW/As0X9ORkZWfd605rAsmh2l j31voEbHfpFKRnw+OIJtgXQ7GtutPFlM2//9PwYzOnvWyexoVVdRaevUwBpE3qlqTg3A LjHx4VKMQLvjxPHztvvPP5Nit71hFDf0N67d59tAwJynHOY+0cd2J98OD6aLCs/Ki8y2 J5/DAYDnTwH2S3DojWxzms8Y1w8BVbWk13aDoAzEI6LGJGfjEaSmF6PGRG/QzD5+rAry UTrA== Sender: isar-users@googlegroups.com X-Gm-Message-State: AC+VfDzNqvbonKBMRk8uonGwxOk3OHT3HZyU/EJk47eFFEu0eKprJBzn awf2MaL05qRIXi/KPflY4PY= X-Google-Smtp-Source: ACHHUZ41qz/0b0YpvYn/7Tgrbi0ZBpxcJClWv2LVsyjQFxUcZaaN32MrSDeSdEsccOVXI16tINlhOQ== X-Received: by 2002:ad4:5a14:0:b0:61b:68e0:53d6 with SMTP id ei20-20020ad45a14000000b0061b68e053d6mr486777qvb.1.1684403255353; Thu, 18 May 2023 02:47:35 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6214:1910:b0:623:8bf3:d76b with SMTP id er16-20020a056214191000b006238bf3d76bls1153279qvb.0.-pod-prod-02-us; Thu, 18 May 2023 02:47:34 -0700 (PDT) X-Received: by 2002:a05:6214:1314:b0:5ee:e4f8:c7e5 with SMTP id pn20-20020a056214131400b005eee4f8c7e5mr4546666qvb.41.1684403254854; Thu, 18 May 2023 02:47:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684403254; cv=none; d=google.com; s=arc-20160816; b=NOqcHPNdfT5a/a30Clmu+GTe0MnNI05wZuvwbJwQzRM8IeO2IJ8Sfgmr2Wgi21U4Nt 77feaTKVvJzm9dUbJcU6CVln3wZUf0Bu+HJ47v5ttzeYDMnUHIjEO58mlup2nDfJXaFS 4pu6g41bX/9i2Hsd0K2Qjl18du7QEiCA2UCRGNNEt+Rv1ee9LavJKrSmQAF6KEFzuKlZ e4Xfn+gRkogG6G4ciRWyFVi+7uOzO5UxpZMKk0drWdt4rwPQZBUsmEGqwu9CGeW9qzHS o7JYudMLBU2S57tcpkus4H8Ni4jsPCayS7GsaQ570A6SC5h581bC9fWYpzbVJMciJhJB 8Mnw== 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=8wbL9Mz9B0cT9zb3CeNNsUetmHQ+0Wv+11MfcwfOCFs=; b=BCPeWSHgeVMKx6oi2S0XzMtGloekLP6/o9kRRvTEWdqPjkUMHNmuWkpwHWVO95vMBm ZvN8bKT5KrjoKaDWxqmLFlOlZOf9kIurz6m2Yi1Bd9x2L8DAwSNhf7gSUnBRdYrPGYnK +r4Eol3LVJJr/iTox++TBiM9+0AdtuyPRDJbtN/aDYVzutkEJefpp/AmSfSDFDfYPTaP 7MwXblHvG87Hrgfl0qyNowQDz/tNRP3cf4EqRfAgDoCD1SQpWK1SCqnIIUx/7rqBPxuK 4mD40ff7dfFig+GRc4To/gNwsd0apP5l5d39Un91oaJB2/BryGhhdOKMC8pJ5AjFgklh OomQ== 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 Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id ez10-20020ad4590a000000b005ef42464657si79132qvb.3.2023.05.18.02.47.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 18 May 2023 02:47:34 -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; Received: from user-B660.. ([85.254.74.3]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 34I9lM4V020451 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 18 May 2023 11:47:28 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v2 5/6] isar-bootstrap: Remove unused code Date: Thu, 18 May 2023 12:47:15 +0300 Message-Id: <20230518094716.117770-6-amikan@ilbers.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230518094716.117770-1-amikan@ilbers.de> References: <20230518094716.117770-1-amikan@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,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: amikan@ilbers.de X-Original-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 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?= 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 2aeceb58..b52edc05 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')}" @@ -177,30 +175,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] From patchwork Thu May 18 09:47:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Mikanovich X-Patchwork-Id: 2816 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Thu, 18 May 2023 11:47:43 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-pj1-f62.google.com (mail-pj1-f62.google.com [209.85.216.62]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 34I9lgMO020511 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 18 May 2023 11:47:43 +0200 Received: by mail-pj1-f62.google.com with SMTP id 98e67ed59e1d1-250109c729esf1253605a91.3; Thu, 18 May 2023 02:47:43 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1684403256; cv=pass; d=google.com; s=arc-20160816; b=ATpdWj5GiMeq5Fdx7R8m4MEwD0+o1OlJoG8ydHACT+cBwsZ5p/5NzJFO6Fe/c/5cmh lmRyoiODun2Fk/XIMY7IwmBx3Q0LkJ1x+m8NKzWuaNMBP+9vipg/C0ZkJ/xX8nGBG1Az PF59ziNBafHMd8RSMYyYUHhn2uWeW26DogIGNLxRiCOHzpXAWUGV+O8z2Cm7sLnIln7F vtzLxaNz7V0W6iFHU4/pb13P5rAZVJjd4/1RdJVdQN5pzGJqQh7xneAoKk3TtQsvpO5C 3TtjE7fW6pwxNjRW9CeUM0dMl2c/17kxjdUbTwzmwGGDqiHfov323T1hVZA8R8MtCtjJ MUmQ== 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:cc:to:from:sender:dkim-signature; bh=KqmzkS2sWx5qfsKhCrBOCz3/AcC5q9VfhVNDBWInsyk=; b=h7iVurZRPlL6E+WHP2Y8zsyFjuuF3owRM9jCO/2ujZhsCm7rGpohLIttJViYlPl9n7 IiG7aEdqP5HQ2LDq2+qlEuybcZW1O4DyhFvhfB7c1Pg9t3ytFfq/QWV8rk0j1Nqg2Zoj nEZs7NJApY7pwYpaAymcehAD+Yh1Dn3Vg5sfiJB3a3wyitbYfRqZMMR4f4DCybhdR6Yd hzHrjb0aZoh5waqtnZ5GFRMlb3lfjo1ntUFF0XgkNMp2WugyIMTEI27xuqFv8umXugKs RAUI2Iy1OxDHmQZh+hEU+Iz2G7VuN4qx/NhkgYpVT0kwvhiEMJ+H2WoVPyBbj8EoMG8d 6p8Q== ARC-Authentication-Results: i=2; 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20221208; t=1684403256; x=1686995256; 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:cc:to:from:sender:from:to:cc:subject:date:message-id :reply-to; bh=KqmzkS2sWx5qfsKhCrBOCz3/AcC5q9VfhVNDBWInsyk=; b=iMZoWEYsvCYl+oW9uJI0rYIjMJyO16pY1QQ+GhNzewiNC6r6z1V2vfRgYq2RSb7QJx xqS5kBffjHf06+yUvTOaBcOAlRC7gw9D0GEabBWAFSGwvGHQpAq9E48uR1hvGL3Rym9B NXDPtulVFxpowWuzVrFiJBBGhoPLmFSoANfzrzrdQfbgYe8SJO1r9XXiOrz2m9PviCIP smEphjHuVksHn2KeFoD0I/V0r7ExVKs340dGFb2yhPBugMP98H3alDaj8KO4jc6IinQ2 g5xk9QGzaf16ihfFnuFFLjuOOqwmBlsSNW6aAsMFh3gI/BueBNYM4irwdtI5N2wAM3k2 sVGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684403256; x=1686995256; 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:cc:to:from :x-beenthere:x-gm-message-state:sender:from:to:cc:subject:date :message-id:reply-to; bh=KqmzkS2sWx5qfsKhCrBOCz3/AcC5q9VfhVNDBWInsyk=; b=N0xSN6JK8ZRSKN57lh5rOp7NMOpfXTdqlemwbdiRVii38pShgY78sMIwVeMVRpcuqB WdewyF1QWQ16BQI1IaDLkeIRa8a3Vnmi+mG7L5bwUF7iPPkhu7YGVUClqt8q/HsebIdR PRA/ANLe/u/pi/p8nqiz9+/z238chcPic3LaPnLHfiFfsp+N7P6OyacYLJEJPRBYrPvH eLJ0u0ws2HHuR3N5eUa6Z1rbWIon6Dl4JAZZTgvMNHLRlCRAcJm5Lw1RBl5rTmpB/zvp Eq9Y4TqzuZZO65WTkZDN1WsKsndPNqq7TibbI9Zgfdsuqi4b6/b2YbPjLJxixEFgKa0H eaIg== Sender: isar-users@googlegroups.com X-Gm-Message-State: AC+VfDzcdfpz/8AQMBY+AsNNw2jQ/YNBPlYhV4Azt30AbCcUzDBX8N38 119+mqwqLlFugWUYVtykGf0= X-Google-Smtp-Source: ACHHUZ6AWJqBI2DQ4JqdAQwx/qEy+7yB8xZ+KC8Gb0MH95NHbrawZtZ+OyssuTUFLHPqv4PBsKuwGQ== X-Received: by 2002:a17:90b:788:b0:252:e511:fc68 with SMTP id l8-20020a17090b078800b00252e511fc68mr486750pjz.7.1684403256112; Thu, 18 May 2023 02:47:36 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:903:287:b0:1a1:9cf1:b35f with SMTP id j7-20020a170903028700b001a19cf1b35fls3760904plr.0.-pod-prod-04-us; Thu, 18 May 2023 02:47:35 -0700 (PDT) X-Received: by 2002:a17:903:2287:b0:1a6:77b8:23e0 with SMTP id b7-20020a170903228700b001a677b823e0mr2231691plh.60.1684403255395; Thu, 18 May 2023 02:47:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684403255; cv=none; d=google.com; s=arc-20160816; b=BoUd7o7oUNp1AU1+bG97v8o0vCjWAskXo6Gk2k/T2QmO5amAs2GFtqhPiv/XLqRagZ d1N8y9F1z4Gjkd9Z7qmAJsxi6LFfhpJ/loaw54wJ6nL3JxWZ6NAhQ+Lp46SUNzCUmBgy fCwlZNEaQYjcATZVLYg8wC69+M0A7GCgHA7ohbkmHcjyhQIlu4IusPdleZgJwycusW0G qlk+o9Dsd6xQotYcFhonikWx5qzcLi64IVdE0sB8LTScyfv9QkQTYwRvryKKm39p6dBD hfJ6ATkcvZsrOSAQTro9ItAv9DBOEWMFAoeFiXZIvEdowEuY/mjSm9waXlwk2Da60R/l S9HQ== 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=IFyVn3y6KJe8A7hG4vjDgCu4x6bybryiZMLlM8T2ofk=; b=JsfjsFZukrvrtY4D9BDuYuoLZnbPM4ewrgH34rrbWNSUJVZIidGjFVqN69jTbDAiUO gRPNfQhhZhY/6YD5rqn3KUuIWn3Z4KM1P77pOxrSiDh/jV/eA87O/akgoWHDn6/lRpFo XsrzmBhVQ/CDRakOjuRqJxspTtujUWvsmUsy8XfBFeB8VANDdviZqbzDjn3CHLI9pHLW Zk3FDUH3tXiUwN2BUHjrD25w90k7tD9dPRhPDnV493iRH3fmsiJhl5FDIETwWT5fXTDQ MaIA/XHs8bf2Bskk0Aq+gk5ejMsoNv6HV+u0aajL6cVzf5YKDxM9m50ET4+TYQGeByqx 361g== 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 Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id kz4-20020a170902f9c400b001a6823f2ab1si43669plb.0.2023.05.18.02.47.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 18 May 2023 02:47:35 -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; Received: from user-B660.. ([85.254.74.3]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 34I9lM4W020451 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 18 May 2023 11:47:29 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Uladzimir Bely , Anton Mikanovich Subject: [PATCH v2 6/6] CI: Install mmdebstrap Date: Thu, 18 May 2023 12:47:16 +0300 Message-Id: <20230518094716.117770-7-amikan@ilbers.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230518094716.117770-1-amikan@ilbers.de> References: <20230518094716.117770-1-amikan@ilbers.de> MIME-Version: 1.0 X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,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: amikan@ilbers.de X-Original-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 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: Uladzimir Bely Signed-off-by: Anton Mikanovich --- scripts/ci_build.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/scripts/ci_build.sh b/scripts/ci_build.sh index 2fa5cccd..055f9211 100755 --- a/scripts/ci_build.sh +++ b/scripts/ci_build.sh @@ -127,6 +127,12 @@ if echo "$TAGS" | grep -Fqive "-startvm"; then fi fi +# install mmdebstrap +if ! command -v mmdebstrap > /dev/null; then + sudo apt-get update -qq + sudo apt-get install -y mmdebstrap +fi + # Provide working path mkdir -p .config/avocado cat < .config/avocado/avocado.conf