From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6788114222392803328 X-Received: by 2002:a17:906:d145:: with SMTP id br5mr12171770ejb.92.1584779523395; Sat, 21 Mar 2020 01:32:03 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a50:ce14:: with SMTP id y20ls4848764edi.2.gmail; Sat, 21 Mar 2020 01:32:02 -0700 (PDT) X-Google-Smtp-Source: ADFU+vtonvarevOW93nNlI+7pncUxG+/7C1mWrASUVbnURsS/5wSoIlr6oAbDJGCXrml7PGaen2Q X-Received: by 2002:a05:6402:1cb4:: with SMTP id cz20mr12383607edb.227.1584779522846; Sat, 21 Mar 2020 01:32:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1584779522; cv=none; d=google.com; s=arc-20160816; b=Mc2LazYJUADMS2ijcsqf7X3JYfUvTN9P3h/W8I1JbOVX4PuyCynKfwy4Ev43FfQPrp OnP7SillGFlZpBMxKQn+I2KITvdGQDxZAIuIjPyArMHvnRJFChCFeiEw52I1zgG42mZa bi8+ac6N4PcVgxf2ZuTCNNpwAFctzJJmTNuUwI4foxI48FX8chfcNIwfirdHTIwhs04t Gx0PSOiZnG64yuInfo/J+ONYjXyMKbXmjb67Yf/Hgr49l3eIU6/u4Ti5T6BbtLRRl/j/ EIIpnxM7Ds95o3cy5xkGZvpocX/pps7n46f7pszNYpT82DwEZwmrPbLwM6FQyKOPZUI/ AjJg== 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=5z0QdJH6mjODn+mj8l6NtmEV8x2cImdx9LOliihgQ+o=; b=bLAHbBDMjFR6iAzsY97Vq1i5dsYSsSP/0W2+7r00X06rKA6RIZeGsgPa2yyghtL9KG SQof0g1kNI+W/mazfUQ3qgS9cA3lmqKfzFtusUCsptGl7hm0lY/XpsQVI1yWfJ7QMxhM H0sxNknmRE3ZmqxFCsi2M5sLi4UTdDZKgtAQTjcWvh+nlJGem8tNPwI1cUtSTEQvDDg2 fTunW6yHTsWsjH93Atz9j2pfF4Kw+CQ9GSZYIDeP9sZIMfQSRwrLivqpNiqpWnbrWzRd 8ILTPKVegvmG7SUX5Ytp7I6hwZMCFiFLwOqfrfyV/ZEMmZ4jb5Ej5qaTWZErHtq6qz4z 4o/A== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id cw13si457031edb.2.2020.03.21.01.32.02 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 21 Mar 2020 01:32:02 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.2 as permitted sender) client-ip=192.35.17.2; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id 02L8W1uA009524 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Sat, 21 Mar 2020 09:32:02 +0100 Received: from localhost.localdomain ([139.22.32.253]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 02L8VuGP021533; Sat, 21 Mar 2020 09:32:01 +0100 From: Henning Schild To: isar-users@googlegroups.com Cc: Vijai Kumar K , Baurzhan Ismagulov , Jan Kiszka , Henning Schild Subject: [PATCHv7 11/29] meta: include DL_DIR deb import/export into bootstrap Date: Sat, 21 Mar 2020 09:31:30 +0100 Message-Id: <20200321083148.26160-12-henning.schild@siemens.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200321083148.26160-1-henning.schild@siemens.com> References: <20200321083148.26160-1-henning.schild@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: XjYshodRZSYR From: Henning Schild The bootstrap step also contains downloading of debs, so it should be surrounded with an import/export as well. Signed-off-by: Henning Schild --- meta/classes/deb-dl-dir.bbclass | 1 + .../recipes-core/isar-bootstrap/isar-bootstrap.inc | 14 +++++++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/meta/classes/deb-dl-dir.bbclass b/meta/classes/deb-dl-dir.bbclass index 2858fea2..4eef0134 100644 --- a/meta/classes/deb-dl-dir.bbclass +++ b/meta/classes/deb-dl-dir.bbclass @@ -7,6 +7,7 @@ deb_dl_dir_import() { export pc="${DEBDIR}/${DISTRO}" export rootfs="${1}" [ ! -d "${pc}" ] && return 0 + mkdir -p "${rootfs}"/var/cache/apt/archives/ flock -s "${pc}".lock -c ' \ sudo find "${pc}" -type f -iname '*\.deb' -exec \ cp -f --no-preserve=owner -t "${rootfs}"/var/cache/apt/archives/ '{}' + diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc index cf3df407..7c4c7d66 100644 --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc @@ -28,6 +28,8 @@ DISTRO_BOOTSTRAP_BASE_PACKAGES_append_gnupg = ",gnupg" DISTRO_BOOTSTRAP_BASE_PACKAGES_append_https-support = ",apt-transport-https,ca-certificates" HOST_DISTRO_APT_SOURCES += "conf/distro/${HOST_DISTRO}.list" +inherit deb-dl-dir + python () { distro_bootstrap_keys = (d.getVar("DISTRO_BOOTSTRAP_KEYS") or "").split() @@ -237,11 +239,12 @@ isar_bootstrap() { fi E="${@ isar_export_proxies(d)}" export IS_HOST debootstrap_args E - sudo -E -s <<'EOSUDO' - set -e - if [ ! -e "${DEPLOY_ISAR_BOOTSTRAP}" ]; then - rm -rf --one-file-system "${ROOTFSDIR}" + if [ ! -e "${DEPLOY_ISAR_BOOTSTRAP}" ]; then + sudo rm -rf --one-file-system "${ROOTFSDIR}" + deb_dl_dir_import "${ROOTFSDIR}" + sudo -E -s <<'EOSUDO' + set -e if [ ${IS_HOST} ]; then ${DEBOOTSTRAP} $debootstrap_args \ ${@get_distro_components_argument(d, True)} \ @@ -333,8 +336,9 @@ isar_bootstrap() { # Finalize debootstrap by setting the link in deploy ln -Tfsr "${ROOTFSDIR}" "${DEPLOY_ISAR_BOOTSTRAP}" - fi EOSUDO + fi + deb_dl_dir_export "${ROOTFSDIR}" } CLEANFUNCS = "clean_deploy" -- 2.24.1