From 1004579ca431cdb239295dc6771af45b41b2791a Mon Sep 17 00:00:00 2001 From: Matei Valeanu Date: Wed, 12 Jun 2019 17:59:53 +0200 Subject: ostree and otaimg enhancements override_image_types_ostree.inc - do_image_ostree task: -add dirs, cleandirs flags, to avoid mktemp, rm, cd, and to also remove at clean -add subimages, imgsuffix flags, to use automatic link creation -create image in IMGDEPLOYDIR, instead of DEPLOY_DIR_IMAGE to use the automatic deploy and clean mechanism (also helps in cleaning old images) override_image_types_ota.inc - do_image_otaimg task: -add dirs, cleandirs flags, to avoid mktemp, rm, cd, and to also remove at clean -avoid untar-ing the ostree image, and use OSTREE_ROOTFS -create image in IMGDEPLOYDIR, instead of DEPLOY_DIR_IMAGE to use the automatic deploy and clean mechanism Move OSTREE_REPO to "${WORKDIR}/ostree-repo", instead of DEPLOY_DIR_IMAGE, this repo is needed for otaimg creation sota_xeon-d.bbclass sota_atom-c3000.bbclass: -set ROOTFS_sota to IMGDEPLOYDIR insted of DEPLOY_DIR_IMAGE, as this is where the otaimg is now created; also use IMAGE_LINK_NAME istead of IMAGE_NAME, to have the correct reference to the image, even if the image was built in a previous run (IMAGE_NAME differs in this case) Change-Id: I44e87311d1819b80d34f924630d09e429d411d41 Signed-off-by: Matei Valeanu --- classes/sota_atom-c3000.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'classes/sota_atom-c3000.bbclass') diff --git a/classes/sota_atom-c3000.bbclass b/classes/sota_atom-c3000.bbclass index f9b4864..dff4294 100644 --- a/classes/sota_atom-c3000.bbclass +++ b/classes/sota_atom-c3000.bbclass @@ -7,7 +7,7 @@ WKS_FILE_sota = "efiimage-sota.wks" OSTREE_INITRAMFS_FSTYPES ?= "ext4.gz" # Set .otaimg to be used as source for generating hddimg -ROOTFS_sota = "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.otaimg" +ROOTFS_sota = "${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.otaimg" # OSTree initrd needs 'ramdisk_size' and 'rw' parameters in order to boot OSTREE_KERNEL_ARGS ?= "rw" -- cgit v1.2.3-54-g00ecf