From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6899501277566205952 X-Received: by 2002:a1c:7fd7:: with SMTP id a206mr4749684wmd.135.1606415328623; Thu, 26 Nov 2020 10:28:48 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:414c:: with SMTP id h12ls1363185wmm.2.gmail; Thu, 26 Nov 2020 10:28:47 -0800 (PST) X-Google-Smtp-Source: ABdhPJzJ0ZItAm5dZfM1dU4IhWF67rFUBXGIN2ESwCbwThLXZ9AqGr+rN4t1HQBDO7RUlG1Zyju4 X-Received: by 2002:a1c:99d3:: with SMTP id b202mr4863701wme.0.1606415327710; Thu, 26 Nov 2020 10:28:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1606415327; cv=none; d=google.com; s=arc-20160816; b=Lju1ZalD2M+iBCMW8+uitP6MiMF+1gH9neJcmBReB8xdoKL1/cEoocZznSvEt1Ezsy DWqKA8LphfZsQvK6SEsOtCz+sh4OLqYM+b76NPbuC6GBM5WvRF1jd0OhdJP+R7YtbOhg hX4ETfYAfXo3u/K4OVyO+KWwMTcIutNWhmm42W4yUCH73RCepJKVOtf4rnbGadhpCXA3 bI/VZuBAQEB4upbAU8Xmb01hC8HEWYv7tDpJpm4IQaIWXBI9IJx+Kb3MvRMMaHI33Fpt u8EzxB/Cn+72n8h+ImRPYmt1T5c+4Rg9USmZLGh6W6ipKP3M4yWY4SeKh4ktYZfvapuN OdxA== 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=CcxF+h+gY5VZjfQc95myp3jqvV/95Wcr7OHdKs/S9xc=; b=kjZIGzgbUEV3oHeSNeqkfZhZgxZEWnZ87Vr51TEBK1fg0dmdSjKXDosyYFdSOMbZwT voyLDk2Yn8aI41K1k89nmxM/+iJ3G4nzdZjMS9P8EhVZGiT2lf8RmXunY+luJ6KbJ9uV D4+sFl1CFji5MUOexbD7cUkQcwvubVaoqvCGy4zmCe1XtwdRt4DJJeuF3WVABBmADKRs UKB1hgIqzCmDBuIjkMJ9bmvQLAQBcjJ4CXOZ2fV3ggzZMDlK3HGr+bw0BJn5CzsyV6kQ 0RunIfkWK3Vz7ejtn+tZM020Lk6jQJ4mq/nE8BhAZni+Z3xD7Y8D7GH0eyT5n/8OobWU ahuA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.137.252 as permitted sender) smtp.mailfrom=Vijaikumar_Kanagarajan@mentor.com Return-Path: Received: from esa4.mentor.iphmx.com (esa4.mentor.iphmx.com. [68.232.137.252]) by gmr-mx.google.com with ESMTPS id y187si226499wmd.1.2020.11.26.10.28.46 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Nov 2020 10:28:47 -0800 (PST) Received-SPF: pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.137.252 as permitted sender) client-ip=68.232.137.252; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.137.252 as permitted sender) smtp.mailfrom=Vijaikumar_Kanagarajan@mentor.com IronPort-SDR: gUrtbjKjdFqV1X6T3k7zLu466lXNg8X3qCgYaPMOOHWsoTxkFIt1MC94F7bFmzgT70Hj9bapxo qcYD9MGRSTfl0gsozwZzVGidhURdxRZ6/sPMCUnbgFEEHeqhWNK5CBF2zQ38+aQVQpT5vRQk3V KFn8hmfehpu1lKVB6GM5D+fBCbOCXv9qJzCCKWa3jU46iK/t4UQh2Uo3ohg34QDixa02SRZvlv devy2SPrD+wfbybiKu49zzaa4/DPNAD/8CaIHSPi3e93nY7eXZctu8TPC/hcASpHXUDievawhm upQ= X-IronPort-AV: E=Sophos;i="5.78,372,1599552000"; d="scan'208";a="55644667" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa4.mentor.iphmx.com with ESMTP; 26 Nov 2020 10:28:46 -0800 IronPort-SDR: jni8B50FK0LPjKg0PT1/iITrXQ/3fvyCjplW39/ev6yfk5rWeQkZdhrQgxGj++WmKEicjyby1C rVm9zKP2HEdyv8+rpKWuGg/lmeqrTtSK2A0yOwM2NhhzzmsXSdSng+5zKa8GISNneZMzCIITjo f3fELgVedxAzTuBRAn6UqYvzi8kectfW5Wu4Y2cRhDdrrk2pwxp8orPTNw/rPRyRbyBFE61HGv /qiZLtFCZFgXaJWEP/tDgBaMKhz8jcxYIrDSwU+ezpa6V68ud8osswzITkC56OiulKk76JDMOL hWA= From: Vijai Kumar K To: CC: Vijai Kumar K Subject: [PATCH v10 02/14] deb-dl-dir: Cache host distro debs separately Date: Thu, 26 Nov 2020 23:58:06 +0530 Message-ID: <20201126182818.7261-3-Vijaikumar_Kanagarajan@mentor.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201126182818.7261-1-Vijaikumar_Kanagarajan@mentor.com> References: <20201126182818.7261-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: Qs2VpD3jMsjV 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 54c2994..92f0259 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 94176a9..fda374a 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 2dcc2f8..4925a45 100644 --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc @@ -258,7 +258,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 @@ -358,7 +362,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