From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6878157486786871296 X-Received: by 2002:a25:8190:: with SMTP id p16mr2138123ybk.134.1606291413070; Wed, 25 Nov 2020 00:03:33 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a25:19c3:: with SMTP id 186ls802406ybz.7.gmail; Wed, 25 Nov 2020 00:03:32 -0800 (PST) X-Google-Smtp-Source: ABdhPJwFhSoPPw3HEjhGizZ/rscYETfM5FY8xLRXnuYcAriCtQRtABgpJCsqm8LneKBMlwDZej+C X-Received: by 2002:a25:9392:: with SMTP id a18mr2951709ybm.330.1606291412666; Wed, 25 Nov 2020 00:03:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1606291412; cv=none; d=google.com; s=arc-20160816; b=VGdWnTLUiZZJIScgLLgSw8DKHFy5Bo1EG6PvAbVK0tOtRLBCsv/19EpZOWxs+reqFP FkUAzqmS1VZqNeWBt7GghZNOsPqEW3WausHyIOv4NhPxVD8IvxX5Xr22PAkzUMcnoJ+p y01SqT1igwR52p4+64Up+h8LxkQC4kmBKW9bleMF45tQ7TjA+9lLvvCpSWwlYm9opxR8 f4a+GOsN1uc4AkN/H0whGr85m0XhuszL0IUYJKWdH5Pt3mF7WDCWTrvcSUz+7USMBphI HGUkUOX356PQL3vcB2zIrYstoGenxI+GDcUuXvQz8lnAzEdcJUHiahA6lDoLgdnHwzXz WgMQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:ironport-sdr:ironport-sdr; bh=Ry7No+QnpeTw8znystQ38lbavyvHuZwSahB1mjExLRI=; b=bafzKX0NhErkDQGzPUXxvgA2mMYd/gP7d1mymAbV9Jc/puGUmkUsMffZ1dDVsGybCV 3iwNsMtpLP9WM8Re4t8/dShIOovKmFcuf2N+PLo4qVjdRslpGRnQEU+cGTks3woytWRk 5fvZGt8+pAFiJfmskiX8fTkizDURoIHPIFW9kW8DD/ylJoR3MggA8tPg6FaQVJya+1HS IbUguF5krVMcFGhNXQwMrL84/xRltKCeb0aq7zsRa4bv+JiwWWc2JRRJ803l5g/KVZzU lTDOun+hWaHiezR0Sfd6PWHJyfDVRwwyIfEEzyGpOMAt+i7btUbFP6l/gTMeJkhTud/R kb0Q== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.129.153 as permitted sender) smtp.mailfrom=Vijaikumar_Kanagarajan@mentor.com Return-Path: Received: from esa1.mentor.iphmx.com (esa1.mentor.iphmx.com. [68.232.129.153]) by gmr-mx.google.com with ESMTPS id 199si77218ybd.5.2020.11.25.00.03.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 25 Nov 2020 00:03:32 -0800 (PST) Received-SPF: pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.129.153 as permitted sender) client-ip=68.232.129.153; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.129.153 as permitted sender) smtp.mailfrom=Vijaikumar_Kanagarajan@mentor.com IronPort-SDR: 3f+5hDBTM3U2uflA9jow/+ntQxqV3xvedPFWJF/4DMQFq99GfKgmmEGs/SuoiAz961fDKcszSA K/cen/59LH9jn/XrEDcT0JFLLIJj/2dJrhr/6k0AEHGcjMZYr5gV3I5GVAChnJgoVGs66kPXGJ sNn/JY/+8X7iE0yzR9tejkU4U+Rp6QIC2HhNF6oc/O9XEb1yikM7Ec4XIxANc0KGrSeBHzpmE9 WuIaM/S9cUrzqvV4TxrKjTVQusut7StL2P+KMMw20h0z4+8sejJ4Ueu7LpF0HwXcqL269yhJBG uYI= X-IronPort-AV: E=Sophos;i="5.78,368,1599552000"; d="scan'208";a="57762474" Received: from orw-gwy-02-in.mentorg.com ([192.94.38.167]) by esa1.mentor.iphmx.com with ESMTP; 25 Nov 2020 00:03:32 -0800 IronPort-SDR: BfXWkH90mT082QRdrYZ06hXJcHp9Y68vKwVBY9fM2mFwgZsYTgfhV3t/sktJRrTHuggCi/63gY 1NXX6x0WEZdBaPyNGabiCJzvtWy2l8uec9+/KDlZY+gAy/1lpadOXN4CTLvU/3vQKsFyLX2xms sUQWxWruJKl8SBGGURm6S5H9P/bYvKi6gjrQ/erOJeSA3YFHuOyDV8PAOEcIgzGAEEE08n935V o4rO53vAoG+kfQxLtPXS/cX1zU+WUNvbOD3O6gzxbdWOQIAYtTB1QiLgZpUdtD0k+E4q+d7Rrx 6EA= From: Vijai Kumar K To: CC: Vijai Kumar K Subject: [PATCH v7 02/14] deb-dl-dir: Cache host distro debs separately Date: Wed, 25 Nov 2020 13:32:49 +0530 Message-ID: <20201125080301.15818-3-Vijaikumar_Kanagarajan@mentor.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201125080301.15818-1-Vijaikumar_Kanagarajan@mentor.com> References: <20201125080301.15818-1-Vijaikumar_Kanagarajan@mentor.com> MIME-Version: 1.0 Content-Type: text/plain Return-Path: Vijaikumar_Kanagarajan@mentor.com X-ClientProxiedBy: svr-orw-mbx-04.mgc.mentorg.com (147.34.90.204) To svr-orw-mbx-01.mgc.mentorg.com (147.34.90.201) X-TUID: /JVXAD8RP8KB In case of targets where HOST_DISTRO!=DISTRO, like rpi-stretch, we were still caching the debs from both the distros into the same DEBDIR/DISTRO directory. With this change, HOST_DISTRO would be cached in the relevant subdirectory and avoids mixing of debs from two separate distros. Signed-off-by: Vijai Kumar K --- meta/classes/deb-dl-dir.bbclass | 4 ++-- meta/classes/dpkg-gbp.bbclass | 8 ++++++-- meta/classes/dpkg.bbclass | 8 ++++++-- meta/classes/image-tools-extension.bbclass | 4 ++-- meta/classes/rootfs.bbclass | 4 ++-- meta/recipes-core/isar-bootstrap/isar-bootstrap.inc | 12 ++++++++++-- 6 files changed, 28 insertions(+), 12 deletions(-) diff --git a/meta/classes/deb-dl-dir.bbclass b/meta/classes/deb-dl-dir.bbclass index e996703..29a3d67 100644 --- a/meta/classes/deb-dl-dir.bbclass +++ b/meta/classes/deb-dl-dir.bbclass @@ -6,7 +6,7 @@ inherit repository deb_dl_dir_import() { - export pc="${DEBDIR}/${DISTRO}/" + export pc="${DEBDIR}/${2}" export rootfs="${1}" [ ! -d "${pc}" ] && return 0 sudo mkdir -p "${rootfs}"/var/cache/apt/archives/ @@ -20,7 +20,7 @@ deb_dl_dir_import() { } deb_dl_dir_export() { - export pc="${DEBDIR}/${DISTRO}/" + export pc="${DEBDIR}/${2}" export rootfs="${1}" mkdir -p "${pc}" flock "${pc}".lock -c ' diff --git a/meta/classes/dpkg-gbp.bbclass b/meta/classes/dpkg-gbp.bbclass index afa1e19..ba5c3eb 100644 --- a/meta/classes/dpkg-gbp.bbclass +++ b/meta/classes/dpkg-gbp.bbclass @@ -12,11 +12,15 @@ GBP_EXTRA_OPTIONS ?= "--git-pristine-tar" do_install_builddeps_append() { dpkg_do_mounts - deb_dl_dir_import "${BUILDCHROOT_DIR}" + distro="${DISTRO}" + if [ ${ISAR_CROSS_COMPILE} -eq 1 ]; then + distro="${HOST_DISTRO}" + fi + deb_dl_dir_import "${BUILDCHROOT_DIR}" "${distro}" sudo -E chroot ${BUILDCHROOT_DIR} \ apt-get install -y -o Debug::pkgProblemResolver=yes \ --no-install-recommends --download-only ${GBP_DEPENDS} - deb_dl_dir_export "${BUILDCHROOT_DIR}" + deb_dl_dir_export "${BUILDCHROOT_DIR}" "${distro}" sudo -E chroot ${BUILDCHROOT_DIR} \ apt-get install -y -o Debug::pkgProblemResolver=yes \ --no-install-recommends ${GBP_DEPENDS} diff --git a/meta/classes/dpkg.bbclass b/meta/classes/dpkg.bbclass index a24386d..4e7c2f7 100644 --- a/meta/classes/dpkg.bbclass +++ b/meta/classes/dpkg.bbclass @@ -9,10 +9,14 @@ PACKAGE_ARCH ?= "${DISTRO_ARCH}" do_install_builddeps() { dpkg_do_mounts E="${@ isar_export_proxies(d)}" - deb_dl_dir_import "${BUILDCHROOT_DIR}" + distro="${DISTRO}" + if [ ${ISAR_CROSS_COMPILE} -eq 1 ]; then + distro="${HOST_DISTRO}" + fi + deb_dl_dir_import "${BUILDCHROOT_DIR}" "${distro}" sudo -E chroot ${BUILDCHROOT_DIR} /isar/deps.sh \ ${PP}/${PPS} ${PACKAGE_ARCH} --download-only - deb_dl_dir_export "${BUILDCHROOT_DIR}" + deb_dl_dir_export "${BUILDCHROOT_DIR}" "${distro}" sudo -E chroot ${BUILDCHROOT_DIR} /isar/deps.sh \ ${PP}/${PPS} ${PACKAGE_ARCH} dpkg_undo_mounts diff --git a/meta/classes/image-tools-extension.bbclass b/meta/classes/image-tools-extension.bbclass index 6590ee7..0b067ff 100644 --- a/meta/classes/image-tools-extension.bbclass +++ b/meta/classes/image-tools-extension.bbclass @@ -25,7 +25,7 @@ do_install_imager_deps() { buildchroot_do_mounts E="${@ isar_export_proxies(d)}" - deb_dl_dir_import ${BUILDCHROOT_DIR} + deb_dl_dir_import ${BUILDCHROOT_DIR} ${DISTRO} sudo -E chroot ${BUILDCHROOT_DIR} sh -c ' \ apt-get update \ -o Dir::Etc::SourceList="sources.list.d/isar-apt.list" \ @@ -35,7 +35,7 @@ do_install_imager_deps() { --allow-unauthenticated --allow-downgrades --download-only install \ ${IMAGER_INSTALL}' - deb_dl_dir_export ${BUILDCHROOT_DIR} + deb_dl_dir_export ${BUILDCHROOT_DIR} ${DISTRO} sudo -E chroot ${BUILDCHROOT_DIR} sh -c ' \ apt-get -o Debug::pkgProblemResolver=yes --no-install-recommends -y \ --allow-unauthenticated --allow-downgrades install \ diff --git a/meta/classes/rootfs.bbclass b/meta/classes/rootfs.bbclass index eae14d5..6316321 100644 --- a/meta/classes/rootfs.bbclass +++ b/meta/classes/rootfs.bbclass @@ -115,7 +115,7 @@ rootfs_install_resolvconf() { ROOTFS_INSTALL_COMMAND += "rootfs_import_package_cache" rootfs_import_package_cache[weight] = "5" rootfs_import_package_cache() { - deb_dl_dir_import ${ROOTFSDIR} + deb_dl_dir_import ${ROOTFSDIR} ${ROOTFS_DISTRO} } ROOTFS_INSTALL_COMMAND += "rootfs_install_pkgs_download" @@ -132,7 +132,7 @@ ROOTFS_INSTALL_COMMAND += "${ROOTFS_INSTALL_COMMAND_BEFORE_EXPORT}" ROOTFS_INSTALL_COMMAND += "rootfs_export_package_cache" rootfs_export_package_cache[weight] = "5" rootfs_export_package_cache() { - deb_dl_dir_export ${ROOTFSDIR} + deb_dl_dir_export ${ROOTFSDIR} ${ROOTFS_DISTRO} } ROOTFS_INSTALL_COMMAND += "${@ 'rootfs_install_clean_files' if (d.getVar('ROOTFS_CLEAN_FILES') or '').strip() else ''}" diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc index fbfe669..3b19914 100644 --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc @@ -255,7 +255,11 @@ isar_bootstrap() { export IS_HOST debootstrap_args E if [ ! -e "${DEPLOY_ISAR_BOOTSTRAP}" ]; then sudo rm -rf --one-file-system "${ROOTFSDIR}" - deb_dl_dir_import "${ROOTFSDIR}" + if [ "${IS_HOST}" ];then + deb_dl_dir_import "${ROOTFSDIR}" "${HOST_DISTRO}" + else + deb_dl_dir_import "${ROOTFSDIR}" "${DISTRO}" + fi sudo -E -s <<'EOSUDO' set -e @@ -356,7 +360,11 @@ isar_bootstrap() { ln -Tfsr "${ROOTFSDIR}" "${DEPLOY_ISAR_BOOTSTRAP}" EOSUDO fi - deb_dl_dir_export "${ROOTFSDIR}" + if [ "${IS_HOST}" ];then + deb_dl_dir_export "${ROOTFSDIR}" "${HOST_DISTRO}" + else + deb_dl_dir_export "${ROOTFSDIR}" "${DISTRO}" + fi } CLEANFUNCS = "clean_deploy" -- 2.17.1