From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6878157486786871296 X-Received: by 2002:a1c:4944:: with SMTP id w65mr4074046wma.50.1606311792134; Wed, 25 Nov 2020 05:43:12 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:3d87:: with SMTP id k129ls1286450wma.3.gmail; Wed, 25 Nov 2020 05:43:11 -0800 (PST) X-Google-Smtp-Source: ABdhPJwcPFdZvqhlgQ04gbso9HCYHlP/7YFBPxUSn5aBm3xZJq6Zf2JDLzLfRHE/RhosVUDmbhs1 X-Received: by 2002:a7b:c101:: with SMTP id w1mr4097642wmi.170.1606311791122; Wed, 25 Nov 2020 05:43:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1606311791; cv=none; d=google.com; s=arc-20160816; b=YKtMeyQuGVvKZc2OF7SgaJZms/jrcfkSNrxY213FnN8EbaOWKOOujOeZzZ2Vxl954X dprFuTwoUAuIhAIOoMbaK7hmnVYiOjP+sSi6IYZgn2DH7VNKcAysv9Urfvdj45C/0WT1 vbpOvIkATOMhmeFlIILSfAnIKGkyqTy0Xr5qzqCKkX3JlcGcCmIi7KcmXQjQXMeCg3il GhGb1aT4THRJZPt/mUbhoJn3xFNutq6Pj94GmO1Alzxn96OGNKZLX5izh53f4ik4QiH8 Usq934mwxgA3GDvv1TjcAAYkKZOoYADoXWSHcYu+kZkFO/vSpb5BeA0DVjCK2mLeFWpl qsuw== 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=RQoIktVQDMkyvBROtyWLHHbCIdfrHkGCn+aaKaiZYO5O7Bp4ovij6dOWjQqCfZyID1 9Jsumb3eYIxs97g2s4m76ghubX4+LkiVFi0jDmQ1XO78Xanxu911I9VMiawZaXEC6wy1 S71u8+QQis9NyNttq9HABXktS0zRpBgeWgohOQN3/0TVvxQ/K7e8uYMmlJa2Vv/lsj/W GdkOmUyXRagIK0Y3vc7fsbnVoBM5DsuLEE6Icm+x98JZbN7MYhUjP+CGNyEovHLuFMzp aPs7JUmvXFMXX51KbGRqfJJN3TqOwE6fkfJ0U+XOdB4OvrHOyGVHOYyK3bVpzC58wEpd Pv9Q== 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 c20si60917wmd.2.2020.11.25.05.43.10 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 25 Nov 2020 05:43:11 -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: CrgG/XkJIDcf148pBH+YJv5fCgka/CsZJdvA3EdOFchhlAgvtfhXe4umEVHjd72nRBFT2oxkyI WvifhX3jK2FwYh+5e1RgDzU8X/k4wtcgXFCL2WEU233CussUD+0BdTRWXz13Auo+hasGaEJUl2 fMF28vT5MTXBgd/gzrCDyWW+Tw3Vxp3EH3UqqsKeHHv8fz5+tTst2Lq/P0Y7DiZoxJ42UKUVoc IgibGeuqhBzmb0wmI7EeyEvY183ZtwydFkdbfGV9NtLdpwD8Ewh+vEXT7qY89eeSKaz1HvscMW oaM= X-IronPort-AV: E=Sophos;i="5.78,368,1599552000"; d="scan'208";a="55597747" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa4.mentor.iphmx.com with ESMTP; 25 Nov 2020 05:43:09 -0800 IronPort-SDR: WB1gJAGFU4kq3qI1ZfN2IQL+BOYTIlJ8eQCOp2htjfffXRqUxhwjWp/6r1cfBxqZHEFvll10zv ZcbTEBTeYX31SwASK9zzc8+Oz3rNi796VNtNVSfQomwio2LshnSyrl3l7FYi/nupysHRBHXisB NoiXd5LqHsEpU66EFSpxP70IpB4bN5gZWryW3WGsET20Gs2qJU2b+paRpOdRhLTaQE0phdII5B 0Ta6Kt34PCPXBosrVXMrcXkqPpaq8vfc7+5EJnXeOJcJuZAnsvgjVXMgD/UdWp2+rALt3Z9jFh o2U= From: Vijai Kumar K To: CC: Vijai Kumar K Subject: [PATCH v8 02/14] deb-dl-dir: Cache host distro debs separately Date: Wed, 25 Nov 2020 19:12:24 +0530 Message-ID: <20201125134236.25878-3-Vijaikumar_Kanagarajan@mentor.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201125134236.25878-1-Vijaikumar_Kanagarajan@mentor.com> References: <20201125134236.25878-1-Vijaikumar_Kanagarajan@mentor.com> MIME-Version: 1.0 Content-Type: text/plain Return-Path: Vijaikumar_Kanagarajan@mentor.com X-ClientProxiedBy: SVR-ORW-MBX-06.mgc.mentorg.com (147.34.90.206) To svr-orw-mbx-01.mgc.mentorg.com (147.34.90.201) X-TUID: wLVikRfk59m+ 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