bootstrap: move to tmp/deploy/bootstrap

Bootstraps should not be placed in tmp/deploy/images/${MACHINES} since they
are only distro and architecture dependent (but not machine dependent). The
older location was apparently causing some build failures for large multiconfig
builds (while this issue was not reproduced, multiconfig builds were done to
make sure the change did not introduce obvious regressions).

Suggested-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Cedric Hombourger <Cedric_Hombourger@mentor.com>

meta/classes/isar-bootstrap-helper.bbclass

@@ -83,7 +83,7 @@ setup_root_file_system() {
     CLEAN_FILES="${ROOTFSDIR}/etc/hostname ${ROOTFSDIR}/etc/resolv.conf"
 
     sudo cp -Trpfx \
-        "${DEPLOY_DIR_IMAGE}/isar-bootstrap-$ROOTFS_DISTRO-$ROOTFS_ARCH/" \
+        "${DEPLOY_DIR_BOOTSTRAP}/$ROOTFS_DISTRO-$ROOTFS_ARCH/" \
         "$ROOTFSDIR"
     [ -n "${FSTAB}" ] && cat ${FSTAB} | sudo tee "$ROOTFSDIR/etc/fstab"
 

meta/conf/isar-bitbake.conf

@@ -19,6 +19,7 @@
 # OTHER DEALINGS IN THE SOFTWARE.
 
 WORKDIR = "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/${PF}"
+DEPLOY_DIR_BOOTSTRAP = "${DEPLOY_DIR}/bootstrap"
 DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE}"
 DL_DIR = "${TOPDIR}/downloads"
 SSTATE_DIR ?= "${TMPDIR}/sstate-cache"

meta/recipes-core/isar-bootstrap/isar-bootstrap-host.bb

@@ -8,8 +8,8 @@
 Description = "Minimal host Debian root file system"
 
 WORKDIR = "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/${PN}-${HOST_DISTRO}-${HOST_ARCH}"
-DEPLOY_ISAR_BOOTSTRAP = "${DEPLOY_DIR_IMAGE}/isar-bootstrap-${HOST_DISTRO}-${HOST_ARCH}"
-ISAR_BOOTSTRAP_LOCK = "${DEPLOY_DIR_IMAGE}/isar-bootstrap-${HOST_DISTRO}-${HOST_ARCH}.lock"
+DEPLOY_ISAR_BOOTSTRAP = "${DEPLOY_DIR_BOOTSTRAP}/${HOST_DISTRO}-${HOST_ARCH}"
+ISAR_BOOTSTRAP_LOCK = "${DEPLOY_DIR_BOOTSTRAP}/${HOST_DISTRO}-${HOST_ARCH}.lock"
 
 include isar-bootstrap.inc
 inherit isar-bootstrap-helper

meta/recipes-core/isar-bootstrap/isar-bootstrap-target.bb

@@ -8,8 +8,8 @@
 Description = "Minimal target Debian root file system"
 
 WORKDIR = "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/${PN}"
-DEPLOY_ISAR_BOOTSTRAP = "${DEPLOY_DIR_IMAGE}/isar-bootstrap-${DISTRO}-${DISTRO_ARCH}"
-ISAR_BOOTSTRAP_LOCK = "${DEPLOY_DIR_IMAGE}/isar-bootstrap-${DISTRO}-${DISTRO_ARCH}.lock"
+DEPLOY_ISAR_BOOTSTRAP = "${DEPLOY_DIR_BOOTSTRAP}/${DISTRO}-${DISTRO_ARCH}"
+ISAR_BOOTSTRAP_LOCK = "${DEPLOY_DIR_BOOTSTRAP}/${DISTRO}-${DISTRO_ARCH}.lock"
 
 include isar-bootstrap.inc
 

meta/recipes-core/isar-bootstrap/isar-bootstrap.inc

@@ -165,7 +165,7 @@ def get_host_release():
 
 
 do_bootstrap[vardeps] += "DISTRO_APT_PREMIRRORS"
-do_bootstrap[dirs] = "${DEPLOY_DIR_IMAGE}"
+do_bootstrap[dirs] = "${DEPLOY_DIR_BOOTSTRAP}"
 
 isar_bootstrap() {
     IS_HOST=""