From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6788114222392803328 X-Received: by 2002:adf:f94f:: with SMTP id q15mr9336241wrr.65.1585230215426; Thu, 26 Mar 2020 06:43:35 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:a799:: with SMTP id j25ls2815867wrc.7.gmail; Thu, 26 Mar 2020 06:43:35 -0700 (PDT) X-Google-Smtp-Source: ADFU+vv/r1OvXwhCS2t5+/YNn+0sLRbf4+A7giAPTCoDT4o1UI8wJpXKd8bfqu+ave+5G9jI6Vh8 X-Received: by 2002:a05:6000:10d1:: with SMTP id b17mr9858250wrx.360.1585230214907; Thu, 26 Mar 2020 06:43:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585230214; cv=none; d=google.com; s=arc-20160816; b=uN/3OY65/UIkw6/2ZkJ66mPXurI/WfnCPZe5MjTVIoXT1kgMADKTNi8twVQtljaK38 kA4Vi8ZHMHnQ1qbpSAqWxh2+adSr5sjeMdVEbhDuvNrD7eo5J3XW628AVftlEhxH/77s YdZY5hUvm8yYj5I9DGmTf0NsQ2wrHCeaTqfMSVEq/ZzuvEKlhuiCzXig8QwxKZDcyDUl lZOkAe7vx56/BV6PYoxAWpViW2TnZEgygPgqs1yArNDfC4kNzUNPFKMeiF+tzlDBropt A3UkHA1AqVyvv4aCIYFzqHmp+SqxMOM/ucKzYhEdtFYap06h3vCNjyDB5WO3ydJo45DI Mu5g== 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=rcTmIhrwAzpQllQV/vAFiyY5d1+tahOewFP8bKsYJRw=; b=iwJ47EmLyXhZOVYuvkXxeQM+1lefx4NrSJyZ7bvw1mXCFMEBMIsgL7i486398rR0s6 CmR62gwOLv0vmjvsnl1BturTJjBWv/CVY16cYGWDlruLdj+fey+Xvbw6FA5/MCC/J8tb KhEW+OHEzy2bss8Ry0oNJF+MlyfnZwjzcCLOse6gn8s/H2cqyUWaKyNWYTPATyC6dXj9 p7LI6P1IH9xy+fHYJuNVGRbjfbY/vlqQkx3GRvKYAW1eSsaH93E7eosPIlI77FwCCqBP GfZlskdJ5kQRr/DMCnja2ry695qxIlSxburDTE0xY7AEWy17wKonXSzM74PGIa3pC9ax SeJA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.14 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 david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id f3si393494wmc.2.2020.03.26.06.43.34 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Mar 2020 06:43:34 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.14 as permitted sender) client-ip=192.35.17.14; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.14 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 david.siemens.de (8.15.2/8.15.2) with ESMTPS id 02QDhYMV022517 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 26 Mar 2020 14:43:34 +0100 Received: from localhost.localdomain ([167.87.11.29]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 02QDhSBh031897; Thu, 26 Mar 2020 14:43:33 +0100 From: Henning Schild To: isar-users@googlegroups.com Cc: Vijai Kumar K , Baurzhan Ismagulov , Jan Kiszka , Henning Schild Subject: [PATCHv8 11/29] meta: include DL_DIR deb import/export into bootstrap Date: Thu, 26 Mar 2020 14:43:07 +0100 Message-Id: <20200326134325.8672-12-henning.schild@siemens.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200326134325.8672-1-henning.schild@siemens.com> References: <20200326134325.8672-1-henning.schild@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: zL6OQ4LE0Lhu 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 2858fea..1e9e1bd 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 + sudo 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 cf3df40..7c4c7d6 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