diff options
| author | Ed Bartosh <ed.bartosh@linux.intel.com> | 2016-09-01 11:56:00 +0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-09-04 00:07:28 +0100 |
| commit | 9cc449273252314fdc88cd62deb18a3e03d8abd5 (patch) | |
| tree | 7be59be75f83dc27aaf1cc8b1e816bce1f03c434 /meta/recipes-core | |
| parent | 619d2996fbb12e6ab63daa73b2d9683023cc2744 (diff) | |
| download | poky-9cc449273252314fdc88cd62deb18a3e03d8abd5.tar.gz | |
image: Deploy images to IMGDEPLOYDIR
Changed deployment directory from DEPLOY_DIR_IMAGE to
IMGDEPLOYDIR to make sstate machinery to do final deployment and
generate manifest.
Renamed variable deploy_dir to deploy_dir_image in selftest code
to avoid confusion with DEPLOYDIR variable.
Updated the code of rootfs.py:Rootfs class to use IMGDEPLOYDIR variable
as it's now used as a new deployment destination.
(From OE-Core rev: 6d969bacc718e21a5246d4da9bf9639dcae29b02)
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
| -rw-r--r-- | meta/recipes-core/images/build-appliance-image_15.0.0.bb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/recipes-core/images/build-appliance-image_15.0.0.bb b/meta/recipes-core/images/build-appliance-image_15.0.0.bb index dc621d60a6..1911d4cb52 100644 --- a/meta/recipes-core/images/build-appliance-image_15.0.0.bb +++ b/meta/recipes-core/images/build-appliance-image_15.0.0.bb | |||
| @@ -32,7 +32,7 @@ BA_INCLUDE_SOURCES ??= "0" | |||
| 32 | 32 | ||
| 33 | IMAGE_CMD_ext4_append () { | 33 | IMAGE_CMD_ext4_append () { |
| 34 | # We don't need to reserve much space for root, 0.5% is more than enough | 34 | # We don't need to reserve much space for root, 0.5% is more than enough |
| 35 | tune2fs -m 0.5 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4 | 35 | tune2fs -m 0.5 ${IMGDEPLOYDIR}/${IMAGE_NAME}.rootfs.ext4 |
| 36 | } | 36 | } |
| 37 | 37 | ||
| 38 | fakeroot do_populate_poky_src () { | 38 | fakeroot do_populate_poky_src () { |
| @@ -101,9 +101,9 @@ create_bundle_files () { | |||
| 101 | cd ${WORKDIR} | 101 | cd ${WORKDIR} |
| 102 | mkdir -p Yocto_Build_Appliance | 102 | mkdir -p Yocto_Build_Appliance |
| 103 | cp *.vmx* Yocto_Build_Appliance | 103 | cp *.vmx* Yocto_Build_Appliance |
| 104 | ln -sf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.vmdk Yocto_Build_Appliance/Yocto_Build_Appliance.vmdk | 104 | ln -sf ${IMGDEPLOYDIR}/${IMAGE_NAME}.vmdk Yocto_Build_Appliance/Yocto_Build_Appliance.vmdk |
| 105 | zip -r ${DEPLOY_DIR_IMAGE}/Yocto_Build_Appliance-${DATETIME}.zip Yocto_Build_Appliance | 105 | zip -r ${IMGDEPLOYDIR}/Yocto_Build_Appliance-${DATETIME}.zip Yocto_Build_Appliance |
| 106 | ln -sf Yocto_Build_Appliance-${DATETIME}.zip ${DEPLOY_DIR_IMAGE}/Yocto_Build_Appliance.zip | 106 | ln -sf Yocto_Build_Appliance-${DATETIME}.zip ${IMGDEPLOYDIR}/Yocto_Build_Appliance.zip |
| 107 | } | 107 | } |
| 108 | create_bundle_files[vardepsexclude] = "DATETIME" | 108 | create_bundle_files[vardepsexclude] = "DATETIME" |
| 109 | 109 | ||