From: Ed Bartosh <ed.bartosh@linux.intel.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH 01/18] image-live.bbclass: deploy images to DEPLOYDIR
Date: Tue, 30 Aug 2016 12:29:34 +0300 [thread overview]
Message-ID: <9e65436d7f34280ca0d184964bce6bb4ae8b32a3.1472548574.git.ed.bartosh@linux.intel.com> (raw)
In-Reply-To: <cover.1472548574.git.ed.bartosh@linux.intel.com>
In-Reply-To: <cover.1472548574.git.ed.bartosh@linux.intel.com>
Changed deployment directory from DEPLOY_DIR_IMAGE to DEPLOYDIR
to make sstate machinery to do final deployment and generate
manifest.
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
---
meta/classes/image-live.bbclass | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/meta/classes/image-live.bbclass b/meta/classes/image-live.bbclass
index f0e6647..1294b11 100644
--- a/meta/classes/image-live.bbclass
+++ b/meta/classes/image-live.bbclass
@@ -43,7 +43,7 @@ ROOT_LIVE ?= "root=/dev/ram0"
INITRD_IMAGE_LIVE ?= "core-image-minimal-initramfs"
INITRD_LIVE ?= "${DEPLOY_DIR_IMAGE}/${INITRD_IMAGE_LIVE}-${MACHINE}.cpio.gz"
-ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.ext4"
+ROOTFS ?= "${DEPLOYDIR}/${IMAGE_LINK_NAME}.ext4"
IMAGE_TYPEDEP_live = "ext4"
IMAGE_TYPEDEP_iso = "ext4"
@@ -144,14 +144,14 @@ build_iso() {
if [ "${PCBIOS}" = "1" ] && [ "${EFI}" != "1" ] ; then
# PCBIOS only media
mkisofs -V ${BOOTIMG_VOLUME_ID} \
- -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.iso \
+ -o ${DEPLOYDIR}/${IMAGE_NAME}.iso \
-b ${ISO_BOOTIMG} -c ${ISO_BOOTCAT} \
$mkisofs_compress_opts \
${MKISOFS_OPTIONS} $mkisofs_iso_level ${ISODIR}
else
# EFI only OR EFI+PCBIOS
mkisofs -A ${BOOTIMG_VOLUME_ID} -V ${BOOTIMG_VOLUME_ID} \
- -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.iso \
+ -o ${DEPLOYDIR}/${IMAGE_NAME}.iso \
-b ${ISO_BOOTIMG} -c ${ISO_BOOTCAT} \
$mkisofs_compress_opts ${MKISOFS_OPTIONS} $mkisofs_iso_level \
-eltorito-alt-boot -eltorito-platform efi \
@@ -160,7 +160,7 @@ build_iso() {
isohybrid_args="-u"
fi
- isohybrid $isohybrid_args ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.iso
+ isohybrid $isohybrid_args ${DEPLOYDIR}/${IMAGE_NAME}.iso
}
build_fat_img() {
@@ -252,13 +252,13 @@ build_hddimg() {
fi
fi
- build_fat_img ${HDDDIR} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.hddimg
+ build_fat_img ${HDDDIR} ${DEPLOYDIR}/${IMAGE_NAME}.hddimg
if [ "${PCBIOS}" = "1" ]; then
syslinux_hddimg_install
fi
- chmod 644 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.hddimg
+ chmod 644 ${DEPLOYDIR}/${IMAGE_NAME}.hddimg
fi
}
--
2.1.4
next prev parent reply other threads:[~2016-08-30 9:30 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-30 9:29 [PATCH 00/18] Provide list of deployment artifacts Ed Bartosh
2016-08-30 9:29 ` Ed Bartosh [this message]
2016-08-30 9:29 ` [PATCH 02/18] image-vm.bbclass: deploy images to DEPLOYDIR Ed Bartosh
2016-08-30 9:29 ` [PATCH 03/18] image.bbclass: " Ed Bartosh
2016-08-30 9:29 ` [PATCH 04/18] " Ed Bartosh
2016-08-30 9:29 ` [PATCH 05/18] image_types_uboot.bbclass: " Ed Bartosh
2016-08-30 9:29 ` [PATCH 06/18] syslinux.bbclass: deploy bootloader " Ed Bartosh
2016-08-30 9:29 ` [PATCH 07/18] build-appliance-image: process images in DEPLOYDIR Ed Bartosh
2016-08-30 9:29 ` [PATCH 08/18] populate_sdk_base.bbclass: deploy sdk artifacts to DEPLOYDIR Ed Bartosh
2016-08-30 9:29 ` [PATCH 09/18] rootfs-postcommands.bbclass: generate manifest in DEPLOYDIR Ed Bartosh
2016-08-30 9:29 ` [PATCH 10/18] selftest: renamed variable Ed Bartosh
2016-08-30 9:29 ` [PATCH 11/18] rootfs.py: use DEPLOYDIR instead of DEPLOY_DIR_IMAGE Ed Bartosh
2016-08-30 9:29 ` [PATCH 12/18] image.bbclass: put image_complete under sstate control Ed Bartosh
2016-08-30 9:29 ` [PATCH 13/18] image.bbclass: cleanup DEPLOYDIR Ed Bartosh
2016-08-30 9:29 ` [PATCH 14/18] populate_sdk_base: put populate_sdk under sstate control Ed Bartosh
2016-08-30 9:29 ` [PATCH 15/18] sstate.bbclass: skip packaging if SSTATE_SKIP_CREATION is set Ed Bartosh
2016-08-30 9:29 ` [PATCH 16/18] image: populate_sdk_base: skip sstate creation Ed Bartosh
2016-08-30 9:29 ` [PATCH 17/18] image: populate_sdk_base: set stamp-extra-info flag Ed Bartosh
2016-08-30 9:29 ` [PATCH 18/18] toaster: fire TaskArtifacts event Ed Bartosh
2016-08-30 10:08 ` [PATCH 00/18] Provide list of deployment artifacts Richard Purdie
2016-08-30 10:21 ` Otavio Salvador
2016-08-30 10:35 ` Ed Bartosh
2016-08-30 10:58 ` Otavio Salvador
2016-08-30 11:21 ` Ed Bartosh
2016-08-30 13:36 ` Otavio Salvador
2016-08-30 14:06 ` Richard Purdie
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=9e65436d7f34280ca0d184964bce6bb4ae8b32a3.1472548574.git.ed.bartosh@linux.intel.com \
--to=ed.bartosh@linux.intel.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox