From patchwork Thu Nov 26 01:19:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vijai Kumar K X-Patchwork-Id: 225 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:df02:0:0:0:0:0 with SMTP id i2csp1229319oou; Thu, 26 Nov 2020 03:19:55 -0800 (PST) X-Received: by 2002:a17:906:a195:: with SMTP id s21mr2238916ejy.146.1606389595495; Thu, 26 Nov 2020 03:19:55 -0800 (PST) ARC-Seal: i=3; a=rsa-sha256; t=1606389595; cv=pass; d=google.com; s=arc-20160816; b=fB/FEtelsUzPe3H9XvTe20WA9ERky5wmtrRKxmdonqwrcrw+hHeohvgJtZFN71vZfW ELXr/BW+TQlcGzInRDOOVgZ0ibLsJ4WXblG/LO7kDPJY6+XdxFmEsjsCY14d4izN6ut+ 9IYmTSKitdg2D0TZ3L2BGEP0z53Sy16C2Ed3OxYd15eFTnalp3Sa6nTYGuYFEManfbpF L2UPg4i3gTeig+Fi05lA0NFcwUa/ZGqlWDKnpTrvdIPSC2GI7CfIThBpeNbS6RwCAWM4 dPgi+aaspcj5tEsyP89I9npFxjBNectTA2VAbxDsG+ltm+6sVQm72ScHJjjC0+YFgt9c bBPA== ARC-Message-Signature: i=3; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:ironport-sdr:ironport-sdr:sender :dkim-signature; bh=+hMqPj30yQrorBDWxEfeUpuNuoU/OCAq9KKnRoAbQ38=; b=mnhX8oiu++ljQvKFvfJEcfGOpXJYnmTtAuM6kOY/zkSRHb38WS9sn3/5MR2aAxN5if ogDc7qmrIBQQ98ZAwj3HDB+exTk1UiDhWTWvfOInG0wHvnJ0oZM1cVpgTNAEhpBJShKH n387DfO2puAXb73+SQl07M5LrS/5TEpOzFkVypf8aWlh1nSbqycEjRpwARjFqKvhFTSi 6IKp0CSY8Xw+lyjV7oTsyUGjSA9Nl+wQFI3Namt+2QtKeOGCb/D7Gy88e9vINlLTtFLj LXchU66DLfc2DjE5XDwHIvSNBc+GdeT2z4iz4Tu9drXFsM1wx0YpnGkMZfhuKayIVYcv SH3w== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=dkVVn2M1; arc=pass (i=2 spf=pass spfdomain=mentor.com); spf=pass (google.com: domain of isar-users+bncbcwp7lf37ukrbw46736qkgqea2sjjiy@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCWP7LF37UKRBW46736QKGQEA2SJJIY@googlegroups.com Received: from mail-sor-f55.google.com (mail-sor-f55.google.com. [209.85.220.55]) by mx.google.com with SMTPS id lx5sor3255549ejb.33.2020.11.26.03.19.55 (Google Transport Security); Thu, 26 Nov 2020 03:19:55 -0800 (PST) Received-SPF: pass (google.com: domain of isar-users+bncbcwp7lf37ukrbw46736qkgqea2sjjiy@googlegroups.com designates 209.85.220.55 as permitted sender) client-ip=209.85.220.55; Authentication-Results: mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=dkVVn2M1; arc=pass (i=2 spf=pass spfdomain=mentor.com); spf=pass (google.com: domain of isar-users+bncbcwp7lf37ukrbw46736qkgqea2sjjiy@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCWP7LF37UKRBW46736QKGQEA2SJJIY@googlegroups.com ARC-Seal: i=2; a=rsa-sha256; t=1606389595; cv=pass; d=google.com; s=arc-20160816; b=MgSghJsGLNtGh95l2XHDUsW0eag/Vb3PJwhsUx6f+XlduGy3DO6E3qGr6DfLcSavxF eE/yJUR2eI6LHFH+2BFeo/gtD9/bs3KDP10GxuJrsgnO8Kq89taRLACR6zYzh/CMVL6J DONEWMMiCNYVUlkmErVJ8T9mxx+UUPzyAAWSdLP9iygSyo0Xov7EY3O0npbRZd7rP9Cb nUNzzO9nnkJ7eM+kQ3tEVWJrZp6NMuvIC29h6BU0aj/ml0EOcxk8/6lIgcsAGucbH6to huhV40+DoC2zYjWfAwrtxc6PZTx6Es5/EOdEFrJDcyZ2UP3IfbJEG49OCdix13/YuLiq tsog== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:ironport-sdr:ironport-sdr:sender :dkim-signature; bh=+hMqPj30yQrorBDWxEfeUpuNuoU/OCAq9KKnRoAbQ38=; b=dISrsfJm9xHANf2Ksf3Zt3tbrGsVJMGr3/MiIU3l0uQ9H6iBqM3CXIfSToe02FNOdF qeVgjSqnKfQfkVglb419qGdCiFjaOWPnH7RNelhDg2sR4aR2QneVu6tckItAWZXJKcx2 Y/8Gdy+OwCWb7KW7YPhHEDfCZep3jnOhHl9Sy9ZNKI+PAV0K7LbMS69/zAs+fVm7vfuO YQk9UnKlTzeavBuloMTHxyMo9401bicE8me9C49wE+iotLNnP9kh3CaJdhx6Hb7ZBTpA q2rxbR6vZLBWpv7cym7YtWPj45n1tP3kCBaIBgLVOUwmI77cFHuP0KqE/X/24+cvPTnO PRFg== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.137.180 as permitted sender) smtp.mailfrom=Vijaikumar_Kanagarajan@mentor.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:ironport-sdr:ironport-sdr:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-subscribe:list-unsubscribe; bh=+hMqPj30yQrorBDWxEfeUpuNuoU/OCAq9KKnRoAbQ38=; b=dkVVn2M1CcS+0EPBmEDCD7+n1bD8jPMRhflzJCPp8xtYZR+9mLhZfP8QAWSVSBj8Ct oA0nVHzG6I0tXYkISx37y2oYgEY50sZwlxH+/FPeoU+DxXVbZo9Ul3YRcplOiCQ9RIcD Akt/JgHMRUbEvMKdNMA0zONyxSHlwIr7BTXKFmcnozmTGrfeAHuqHvngVxL+qq9iWE9T hQO+gg3dIl0AT7ROqCGldAji7gaTuVAEfT4LxcCGoH/sQDr7ZuZGE/3bWu5FCGS8V3Z7 e8FHNW1XmbJBLfrHqKeKenxhc3KwUFCAYPBMCXWpyN8VYrjM3+YPqguP+BQ31Oq/O+bM NVFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:ironport-sdr:ironport-sdr:from:to:cc :subject:date:message-id:in-reply-to:references:mime-version :x-original-sender:x-original-authentication-results:precedence :mailing-list:list-id:x-spam-checked-in-group:list-post:list-help :list-archive:list-subscribe:list-unsubscribe; bh=+hMqPj30yQrorBDWxEfeUpuNuoU/OCAq9KKnRoAbQ38=; b=bvcHObh3ctu4TYw+5uStf9EjK7Cv3GQEejKeXB4+ghmBgo4Ay2KnAst1w69L28J3dO qdLWpZmdBtRD2Kn4AsXKNdn1ed0rQvArKYb8DZb0WLX7vkL5bFJXzYHJTzpX7l/OCRF2 FjrVljH6B9hzIaBi3Lnq6fgShDmVJmhVvj2j6u2NU0Mub9q40wDmexzNc6OCt5XUPFoP zHCqL/kZXtvLxen3z8RZ8CTgfFKN9i42/y6FRoAHNkIN8vZBYc2baB/4aPggp9uVf/Uu 4gaaDD04Yjw4B0cGdR9f1bYzh3AfM3b0h0qJwjS8dY+RSIYqyw1afULvOTeS1l7kklJV 8iYg== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM530bV9gAhGLLmefhQ38oFjEIQhxAsbTPP00iODKO5F+7QBQIUasP HK3uKxEhVyx3WQZEF5JBjP8= X-Google-Smtp-Source: ABdhPJxNVw6xzu3+PINjYypRlvgr5mCWa3T1nNHggGgOqUHJ7iDLf95zKCNFfXC0b1rvvE1Rw4EvVg== X-Received: by 2002:a17:906:e254:: with SMTP id gq20mr2156867ejb.520.1606389595191; Thu, 26 Nov 2020 03:19:55 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:906:b088:: with SMTP id x8ls774050ejy.6.gmail; Thu, 26 Nov 2020 03:19:54 -0800 (PST) X-Received: by 2002:a17:906:4059:: with SMTP id y25mr2205161ejj.498.1606389594290; Thu, 26 Nov 2020 03:19:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1606389594; cv=none; d=google.com; s=arc-20160816; b=AGXT36dFzTvLNtg5e0riZWWV7xJrM/KlXKFYMfpKug8GmGCUwjGPTujkhjYYQWjWB6 5j1P3iHYXhHZSqNWgxWoqQU0VUnywR2acCZp76nniVlFo1G56/a6ovcHuBc36/Vxt0yT m+PPR2a0nm/IBwzxarbIp9r6jS9ygmY+upkpnyjbaRlZh4R58BCEmhJR+q0OkJdzR3Yx D+x2s+6O1CosmUMZnYsmDABsUBNgzf5snrOSQPVz5kn4rw++8BGpw5U4GfNuQqqspMMF C6KutdKB4Nv5iCWgXKtSEGa6QsKQzprlMFe7GTNqTW4fKXdTyZF66lLj/9G3Xe2lV9xY geIw== 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=u/YjXdDawB2IDjRHzr2L3gmAx8qCDgi642Q67y68bwo=; b=CCHeos00nwRQlDkg+eHM+9HsYVVBCkgfD/g2MBwZxk+1kmVkjkCMrOUQjd9yBhzB7T X4gpL7mGYg7VUFbX2a62xVI6h5Ch3cRlc47X1P43EqLtF+Grzg+KgLEJ3lvi2xch3Vtw iEe+QIHgPh5cyeZ2h9wnKiumrnulPZktkUKPaboqB8TXWX4voCfdVAxQRoql+rn+u4Vy vEkzYOUdrN0Lg1n5X1m8p8lSgxXQE8jse+9QK9i8uAN3hI/q4v3o6SprKZXC+rpDCCD/ e/saeQavtBigRDEYFuW9FOpcT/4GAHF9gUWZNctZePcH+d+o51SVLSXT3hEfT7udcidi jL3w== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.137.180 as permitted sender) smtp.mailfrom=Vijaikumar_Kanagarajan@mentor.com Received: from esa3.mentor.iphmx.com (esa3.mentor.iphmx.com. [68.232.137.180]) by gmr-mx.google.com with ESMTPS id v7si292239edj.5.2020.11.26.03.19.53 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Nov 2020 03:19:54 -0800 (PST) Received-SPF: pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.137.180 as permitted sender) client-ip=68.232.137.180; IronPort-SDR: H7PQ8dkqVAUHziVE+iBoULX4ZtQTIHm14+QFnwsyS/DjGmdB3Gia1obwxL1+ucGCU+GbtCddpf X//C4xoM7QDXXmxKSPvTRbqextvOhgixEOFvShXh25Z6MPQIp7/lLhXAjXlvRdpjfavLSINkQF giIgqSeF413FbAvJpRgsUUKG+M9G4/3jEiqopwmWMOa9BqpQ1tZiELk2LdgJHAqrg+YC7jkdZP qBPzlo1Gw24cyeVDPwZngIKF4so9kGsOrYkzYswMInfLvPSs9z1zRZDuvI80+1ICes1uVF5PK4 mh4= X-IronPort-AV: E=Sophos;i="5.78,371,1599552000"; d="scan'208";a="55500404" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa3.mentor.iphmx.com with ESMTP; 26 Nov 2020 03:19:53 -0800 IronPort-SDR: uskSppOJ9FlXSPTrM9BYBTzJuBRC+3jdrbC7C0elOMjiI5RS8yHPsyLkRT4fN0hIdNPeZJsJHT OttUgn2zl46ulD/ZdbSbKsciuPGVi84yM4RDvRsbl48YD6uC8/uL/RCooCxl7z5rHR9IoZT/gD ASotsqBY7vg63N7l/nWlGUowjmAZOIURltKWhfC6jF6KHt1vB8KG45X4AJO9bVaVNUXDDly6e/ c0QI3ElWN5Xp2v0QkuSIfqoMdDBdXuOTUnUzW1hLau3ZsJO2AB+rUhNQSkQ7CycIc3RcqKRrXh 6gM= From: Vijai Kumar K To: , CC: Vijai Kumar K Subject: [PATCH v9 02/14] deb-dl-dir: Cache host distro debs separately Date: Thu, 26 Nov 2020 16:49:00 +0530 Message-ID: <20201126111912.3037-3-Vijaikumar_Kanagarajan@mentor.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201126111912.3037-1-Vijaikumar_Kanagarajan@mentor.com> References: <20201126111912.3037-1-Vijaikumar_Kanagarajan@mentor.com> MIME-Version: 1.0 X-ClientProxiedBy: SVR-ORW-MBX-09.mgc.mentorg.com (147.34.90.209) To svr-orw-mbx-01.mgc.mentorg.com (147.34.90.201) X-Original-Sender: vijaikumar_kanagarajan@mentor.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.137.180 as permitted sender) smtp.mailfrom=Vijaikumar_Kanagarajan@mentor.com Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1684421576349021937?= X-GMAIL-MSGID: =?utf-8?q?1684421576349021937?= 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 f9c8995..fb4a3b6 100644 --- a/meta/classes/rootfs.bbclass +++ b/meta/classes/rootfs.bbclass @@ -114,7 +114,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" @@ -131,7 +131,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 9a5ebfd..6b2e5a7 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"