From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6816610675337461760 X-Received: by 2002:a05:651c:30b:: with SMTP id a11mr1538673ljp.164.1587115857700; Fri, 17 Apr 2020 02:30:57 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ac2:5456:: with SMTP id d22ls239467lfn.6.gmail; Fri, 17 Apr 2020 02:30:57 -0700 (PDT) X-Google-Smtp-Source: APiQypK7WrEFTwSEJLtVy1A9g18bCchZRoeW7aPqYNOnJPYzle5rT17MLmWN/+hCHYNnNsOJDTob X-Received: by 2002:a19:f518:: with SMTP id j24mr1500539lfb.205.1587115856301; Fri, 17 Apr 2020 02:30:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587115856; cv=none; d=google.com; s=arc-20160816; b=OT5VxlbNDBQfy4jFhP9cOrqdVH+R1moPw+b3P9oooOHxRmAUFQWzQBuTAAGiwfyDL6 m3h+DjrIsglrejSO2m9qluoJ3CR0rvqXJMcyfTNlhTVTfA55zsfGJd+5k97LFNkKb2pG 4by/wtabSOYQXPMoYO0Tt5/0rYMHnZ09+6Ql7v9K6rqyGyifhlZdLGNp3FHCPAZwtE5/ o57t3YS8nHI7KwD+95F56YTWN4rFoo5+gbEUHT25KD16Q5Y2CBjWz17QCrmf2rLMqCaw eHNc67xIZQ4Q1nXDdkMKWGMnwPqm3LINIpIvyeV8dfM00hhzXaN8nHXMCh1f8FOsk6Gp XIDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=W/DjJn6cEUS2PmSs9KpB2kdkhXqsckNEbbffy4nObQM=; b=D2H3Urr9L0nSWojI2OyRlH+2TxJWSsSzwFE0EAC1EeybpWVQnIE77MzWUP4nvxlgcz HzrITW52wbHd6CVlADESjCiFQhchPhasS4iLF8qPF1meZnljAXaAacBU1p2ZsPrlMJY7 tuduRnKK0j9wxh6/yPYKYzysJpTVhgXZCuaEo/yfUq5cjIFTLBUq+LwSCN9+mRAG2iMv 7EIIBbpD1aCFGGhDIgft2TfZ3ljFRwnnHfe11ct9e6+4dyhLP6R+jtfiewXOlA/wBNVF fBOs5HEZIvFpu+0hCgnZH9GRIoQ9iNweWpa/fkS77wyQcmPxp1otVGxAcLRI8sTXsQPc IioA== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=EISgwh8p; spf=pass (google.com: domain of vijaikumar.kanagarajan@gmail.com designates 2a00:1450:4864:20::444 as permitted sender) smtp.mailfrom=vijaikumar.kanagarajan@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail-wr1-x444.google.com (mail-wr1-x444.google.com. [2a00:1450:4864:20::444]) by gmr-mx.google.com with ESMTPS id f25si1232691lfc.3.2020.04.17.02.30.56 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 17 Apr 2020 02:30:56 -0700 (PDT) Received-SPF: pass (google.com: domain of vijaikumar.kanagarajan@gmail.com designates 2a00:1450:4864:20::444 as permitted sender) client-ip=2a00:1450:4864:20::444; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=EISgwh8p; spf=pass (google.com: domain of vijaikumar.kanagarajan@gmail.com designates 2a00:1450:4864:20::444 as permitted sender) smtp.mailfrom=vijaikumar.kanagarajan@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: by mail-wr1-x444.google.com with SMTP id i10so2229230wrv.10 for ; Fri, 17 Apr 2020 02:30:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=W/DjJn6cEUS2PmSs9KpB2kdkhXqsckNEbbffy4nObQM=; b=EISgwh8pXKs6OyP3gm1RxMKJxYOZfABEspt9FTKqCi7H7ut4LbQElsLoP5aPIx5vfk N7zbhj3dGab+hBpYaonZE1q5i1P+o6QTZjpoiXqofEycLu5wl65HRWDQaD5bjMCI8tSL W3kUKpDFJnfsfAST5KPgyu0HSrbiPDxr4sMI/Wl1HKh5S0HGqFV/QDeyblp52VHZ8d7a wZfhTIafrFYM8iMZ4Dv7D/ar351N9MmQcD/wNrJ1XZU83OCl7s6iFJxH8vAH5OphMvWZ EZVzcCZfJKuCzasT5zpcacOc2hoa9/dh3r+z1H2FZwY5WU3TasyuZDC0gzwCExTmJIzj psxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=W/DjJn6cEUS2PmSs9KpB2kdkhXqsckNEbbffy4nObQM=; b=E8IBObZBLtQKTvcf1Eb6H56kX8bgE2n+MqnQGp9n8xGnmhm9DbIQmCvL8DQFQNkKhd WNl6zO98EEHk4bvkjM0wWtMrWqdQ9J7kE5TWqIu8b+T0gweuKalzVeOX6436WjWi9840 EaNVdHEg55HdwwVsQwngS/JtABufk4DFQn1NNU7I8CxpLkhCUEqav2L876QF0SF6cXM/ 5pyNTXB/f8o+hWgItQK4l3x5fBm/3d+iqdmVe5Z+IgjmE46kGOPc4wafNs3pp5V9Upc9 A5SHacWfaG991gdy8I4dTCgKDxfBipgMd4ntXLHKXDH7uhvFII2yzpfuBR9G/oTR5m3i aJeA== X-Gm-Message-State: AGi0PuadNFPdKA87r4kNPjtZHeD3sdKccsQ/9mJi7d131+hTq031APr1 NjXHhniIkrGj+pujEAM5pPDDJ/YHB80= X-Received: by 2002:a5d:49cb:: with SMTP id t11mr2875872wrs.91.1587115855297; Fri, 17 Apr 2020 02:30:55 -0700 (PDT) Return-Path: Received: from oxygen.mgc.mentorg.com (nat-sch.mentorg.com. [139.181.36.34]) by smtp.gmail.com with ESMTPSA id l15sm6836256wmi.48.2020.04.17.02.30.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Apr 2020 02:30:54 -0700 (PDT) From: Vijai Kumar K X-Google-Original-From: Vijai Kumar K To: isar-users@googlegroups.com Cc: henning.schild@siemens.com, ibr@radix50.net, jan.kiszka@siemens.com, Vijai Kumar K Subject: [PATCH v5 02/13] deb-dl-dir: Cache host distro debs separately Date: Fri, 17 Apr 2020 15:00:29 +0530 Message-Id: <20200417093040.15130-3-Vijaikumar_Kanagarajan@mentor.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200417093040.15130-1-Vijaikumar_Kanagarajan@mentor.com> References: <20200417093040.15130-1-Vijaikumar_Kanagarajan@mentor.com> X-TUID: rp/lE0RE8ayR 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 585365e..53862b5 100644 --- a/meta/classes/dpkg.bbclass +++ b/meta/classes/dpkg.bbclass @@ -7,10 +7,14 @@ inherit dpkg-base 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} ${DISTRO_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} ${DISTRO_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 8bb003d..cee358c 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 da0d436..4061c86 100644 --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc @@ -247,7 +247,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 @@ -344,7 +348,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