From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6878157486786871296 X-Received: by 2002:a17:90a:8a0d:: with SMTP id w13mr1087395pjn.218.1601445839717; Tue, 29 Sep 2020 23:03:59 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:902:fe0d:: with SMTP id g13ls431808plj.8.gmail; Tue, 29 Sep 2020 23:03:59 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxFt3zAt97NyucpztJU/UaVENFUOBex70FuJbVNg+0qb7M9umN1H/F+83Eh3s34jbEXCFjB X-Received: by 2002:a17:90a:d304:: with SMTP id p4mr1171813pju.138.1601445839099; Tue, 29 Sep 2020 23:03:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1601445839; cv=none; d=google.com; s=arc-20160816; b=IDPMDuomiorw9UMEi6CiS+IzRK97GuntKACe61Jx/md86qWwl5S5HgbzJMFucZ/crh T0/pbxHXDIzymxnQ9jwnDVlxsvD8GmNf8wOn09hTfkCheQhOIqlHCCDZ69Z6zebLV2Fr iIoMnvuuxWeZo2AUrFaEOvm7ZObF7VgWFqDjmlHw7U7ubpI/ysaOEBVNiXqfAKDIyE05 bh1hDsepSn1PKRIVce2Q7HsSh9I33h6WTjr5ogD42DxAdre5jNQqgMD6ndP827GO/Sqx gNqc1JYJ9uosCg0tihS6CPHkHJlMymbDCRA+7D7Seajbig1XnFhkrD6CXOmq5mD2Kezk EvJQ== 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=pjboa+ouQ3l1rUYeXjd0wflwYWYzd5vFb8wmAy+X/Gq7Ggnr0SW6oe9TXnsgvhElr+ hT+ZUSQ163KxeKS1uI0MBepT2cDmNVOlQiZLKHJxLwr/XNtvlU/0O4D9oNZowgTPva4P Gcz+n3WxR8ylzXR7kCNMHeZwx/fNe86zZFT/0i4If982/hHF1VnVV0Goiz0dvkq3YRKX GlhdiI3PzUtYjDyh8BgGJklFhnmgrHG/qbRpx+ynn9GLTOdgve+Rbc2wqMHkLaUtrlEB 8jOsmnY90j0skiPJXmIuNyV55PjYZFSrlvifk9sN8KkOtG4pTW/IZsKf7xkgr+n7pDkR YgcA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.141.98 as permitted sender) smtp.mailfrom=Vijaikumar_Kanagarajan@mentor.com Return-Path: Received: from esa2.mentor.iphmx.com (esa2.mentor.iphmx.com. [68.232.141.98]) by gmr-mx.google.com with ESMTPS id mm16si51246pjb.2.2020.09.29.23.03.58 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 29 Sep 2020 23:03:59 -0700 (PDT) Received-SPF: pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.141.98 as permitted sender) client-ip=68.232.141.98; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.141.98 as permitted sender) smtp.mailfrom=Vijaikumar_Kanagarajan@mentor.com IronPort-SDR: ENQRUCDkNWAxc8L+ayOqWEp2eMaeyq7zAyhSBSiQ5OCpiUU57xikB9VkNrTEr55si6l9/Q822e kKr75m6KWrpCGKdMP27/4QNsmZW7Ae5NcTb613gWstLlfVpxJk/7JspJ4lIMutFf3++mPi2b+u 5qqXsAE7+qw+pzVSzfVex9f9pGrMUjnqOMsLA1apURFRu4q5/KSzahYB3G9S80rcsT3LqTifBT I0devJnwNrXSqzUMlb4Vm3g98lZefHvTJFsBEb1flPRlvO666H0Rv5T6muMaXWr3mdnV5Zd4K7 P4Y= X-IronPort-AV: E=Sophos;i="5.77,321,1596528000"; d="scan'208";a="53461962" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa2.mentor.iphmx.com with ESMTP; 29 Sep 2020 22:03:58 -0800 IronPort-SDR: dWYnbmWW8wRIrY+kmuhZ5HWJ1S+BsMwvMxO8aznkCGMyu6bGWOn9HsfINOegP7RQ4mbnAO5WNl H/e5w/DYVzt39ittCMIsGN2RxyKa07ykJVfntiag8qUEyOhIe6sZYOxwrgW3AaBlm0ewl8tWnt pC6s1QnM8oMH16Nzl0DqJe0MIi8jUQNwQ8XtfOAUpKz+d0WkX43+303O+vgMiL3Z0FekFkwq/g IE5bDI83Q1vuE3GFnjMEb/6awwMA0Jq3H3ru2asbSpzFCNAP2ZwSruCQ3Mmm/KrOEU0f7KhimZ fdk= From: Vijai Kumar K To: CC: Vijai Kumar K Subject: [PATCH v6 02/13] deb-dl-dir: Cache host distro debs separately Date: Wed, 30 Sep 2020 11:32:48 +0530 Message-ID: <20200930060259.12422-3-Vijaikumar_Kanagarajan@mentor.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200930060259.12422-1-Vijaikumar_Kanagarajan@mentor.com> References: <20200930060259.12422-1-Vijaikumar_Kanagarajan@mentor.com> MIME-Version: 1.0 Content-Type: text/plain Return-Path: Vijaikumar_Kanagarajan@mentor.com X-ClientProxiedBy: SVR-ORW-MBX-05.mgc.mentorg.com (147.34.90.205) To svr-orw-mbx-01.mgc.mentorg.com (147.34.90.201) X-TUID: fD0oH3pD0+tl 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