Re: [PATCH v2] image: include image name in the kernel/initrd image copies

[Cedric Hombourger <chombourger@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 7471 bytes --]

Hi Maxim

Yes I will try to get to it today

Cedric

> On Oct 25, 2018, at 1:19 PM, Maxim Yu. Osipov <mosipov@ilbers.de> wrote:
> 
> Hi Cedric,
> 
> Are you going to send V3 of the patch to address Jan's and Henning's suggestions to v2?
> 
> Kind regards,
> Maxim.
> 
> 
> On 10/22/18 4:52 PM, Jan Kiszka wrote:
>> On 22.10.18 13:49, cedric_hombourger@mentor.com wrote:
>>> Hi Jan,
>>> 
>>> Did you have a chance to look at v2?
>>> Did I manage to address your initial review findings?
>> Sorry, we were/are busy for ELC-E preparations: On first sight, it looks good to me.
>> Just wondering: Do we want/need to document the renaming of kernel/initrd somewhere, maybe in RECIPE-API-CHANGELOG.md?
>> Jan
>>> 
>>> Thanks
>>> Cedric
>>> 
>>> On Thursday, October 18, 2018 at 7:24:12 PM UTC+2, Cedric Hombourger wrote:
>>> 
>>>     The kernel and initrd images are really image-specific (especially the later
>>>     as the initrd is created/updated as packages get installed into the root
>>>     file-system). Make sure we retain a per-image copy of these images in the
>>>     image deploy directory by inserting the name of the image (${PN}) into the
>>>     full name of the artifacts (set in ${KERNEL_IMAGE} and ${INITRD_IMAGE}).
>>> 
>>>     In addition, an IMAGE_FULLNAME variable is introduced to combine the three
>>>     components of the image name: the (base) name of the image, the name of the
>>>     distribution and the name of the machine. This variable is now used in the
>>>     start_vm script and the image classes (image, ext4-img and wic-img).
>>> 
>>>     Signed-off-by: Cedric Hombourger <Cedric_Hombourger@mentor.com
>>>     <mailto:Cedric_Hombourger@mentor.com>>
>>>     ---
>>>       meta/classes/ext4-img.bbclass | 2 +-
>>>       meta/classes/image.bbclass    | 7 ++++---
>>>       meta/classes/wic-img.bbclass  | 6 +++---
>>>       3 files changed, 8 insertions(+), 7 deletions(-)
>>> 
>>>     diff --git a/meta/classes/ext4-img.bbclass b/meta/classes/ext4-img.bbclass
>>>     index 78036a2..29e5f77 100644
>>>     --- a/meta/classes/ext4-img.bbclass
>>>     +++ b/meta/classes/ext4-img.bbclass
>>>     @@ -1,7 +1,7 @@
>>>       # This software is a part of ISAR.
>>>       # Copyright (C) 2015-2017 ilbers GmbH
>>> 
>>>     -EXT4_IMAGE_FILE = "${DEPLOY_DIR_IMAGE}/${PN}-${DISTRO}-${MACHINE}.ext4.img"
>>>     +EXT4_IMAGE_FILE = "${DEPLOY_DIR_IMAGE}/${IMAGE_FULLNAME}.ext4.img"
>>> 
>>>       do_ext4_image[stamp-extra-info] = "${DISTRO}-${MACHINE}"
>>> 
>>>     diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
>>>     index 05ff06f..ad19f3d 100644
>>>     --- a/meta/classes/image.bbclass
>>>     +++ b/meta/classes/image.bbclass
>>>     @@ -7,6 +7,9 @@ IMAGE_ROOTFS   = "${WORKDIR}/rootfs"
>>> 
>>>       IMAGE_INSTALL += "${@ ("linux-image-" + d.getVar("KERNEL_NAME", True)) if
>>>     d.getVar("KERNEL_NAME", True) else ""}"
>>> 
>>>     +# Name of the image including distro&machine names
>>>     +IMAGE_FULLNAME = "${PN}-${DISTRO}-${MACHINE}"
>>>     +
>>>       # These variables are used by wic and start_vm
>>>       KERNEL_IMAGE ?= "${@get_image_name(d, 'vmlinuz')[1]}"
>>>       INITRD_IMAGE ?= "${@get_image_name(d, 'initrd.img')[1]}"
>>>     @@ -21,9 +24,7 @@ def get_image_name(d, name_link):
>>>           path_link = os.path.join(S, name_link)
>>>           if os.path.exists(path_link):
>>>               base = os.path.basename(os.path.realpath(path_link))
>>>     -        full = base
>>>     -        full += "_" + d.getVar("DISTRO", True)
>>>     -        full += "-" + d.getVar("MACHINE", True)
>>>     +        full = d.getVar("IMAGE_FULLNAME", True) + "." + base
>>>               return [base, full]
>>>           if os.path.islink(path_link):
>>>               return get_image_name(d, os.path.relpath(os.path.realpath(path_link),
>>>     diff --git a/meta/classes/wic-img.bbclass b/meta/classes/wic-img.bbclass
>>>     index d0747e2..e7527c8 100644
>>>     --- a/meta/classes/wic-img.bbclass
>>>     +++ b/meta/classes/wic-img.bbclass
>>>     @@ -63,7 +63,7 @@ addtask do_rootfs_wicenv after do_copy_boot_files before
>>>     do_wic_image
>>>       do_rootfs_wicenv[vardeps] += "${WICVARS}"
>>>       do_rootfs_wicenv[prefuncs] = 'set_image_size'
>>> 
>>>     -WIC_IMAGE_FILE ="${DEPLOY_DIR_IMAGE}/${PN}-${DISTRO}-${MACHINE}.wic.img"
>>>     +WIC_IMAGE_FILE ="${DEPLOY_DIR_IMAGE}/${IMAGE_FULLNAME}.wic.img"
>>> 
>>>       do_build[stamp-extra-info] = "${DISTRO}-${DISTRO_ARCH}"
>>> 
>>>     @@ -81,10 +81,10 @@ do_wic_image() {
>>>           sudo -E chroot ${BUILDCHROOT_DIR} \
>>>               ${ISARROOT}/scripts/wic create ${WKS_FULL_PATH} \
>>>                   --vars "${STAGING_DIR}/${MACHINE}/imgdata/" \
>>>     -            -o /tmp/${PN}-${DISTRO}-${MACHINE}.wic/ \
>>>     +            -o /tmp/${IMAGE_FULLNAME}.wic/ \
>>>                   -e ${IMAGE_BASENAME} ${WIC_CREATE_EXTRA_ARGS}
>>>           sudo chown -R $(stat -c "%U" ${ISARROOT}) ${ISARROOT}/meta
>>>     ${ISARROOT}/meta-isar ${ISARROOT}/scripts || true
>>>     -    cp -f $(ls -t -1
>>>     ${BUILDCHROOT_DIR}/tmp/${PN}-${DISTRO}-${MACHINE}.wic/*.direct | head -1)
>>>     ${WIC_IMAGE_FILE}
>>>     +    cp -f $(ls -t -1 ${BUILDCHROOT_DIR}/tmp/${IMAGE_FULLNAME}.wic/*.direct
>>>     | head -1) ${WIC_IMAGE_FILE}
>>>       }
>>> 
>>>       do_wic_image[file-checksums] += "${WKS_FULL_PATH}:True"
>>>     --     2.11.0
>>> 
>>> -- 
>>> You received this message because you are subscribed to the Google Groups "isar-users" group.
>>> To unsubscribe from this group and stop receiving emails from it, send an email to isar-users+unsubscribe@googlegroups.com <mailto:isar-users+unsubscribe@googlegroups.com>.
>>> To post to this group, send email to isar-users@googlegroups.com <mailto:isar-users@googlegroups.com>.
>>> To view this discussion on the web visit https://groups.google.com/d/msgid/isar-users/d09c4a2f-4249-4914-9ceb-b5dfdf8924fa%40googlegroups.com <https://groups.google.com/d/msgid/isar-users/d09c4a2f-4249-4914-9ceb-b5dfdf8924fa%40googlegroups.com?utm_medium=email&utm_source=footer>. 
>>> For more options, visit https://groups.google.com/d/optout.
> 
> 
> -- 
> Maxim Osipov
> ilbers GmbH
> Maria-Merian-Str. 8
> 85521 Ottobrunn
> Germany
> +49 (151) 6517 6917 <tel:+49%20(151)%206517%206917>
> mosipov@ilbers.de <mailto:mosipov@ilbers.de>
> http://ilbers.de/ <http://ilbers.de/>
> Commercial register Munich, HRB 214197
> General Manager: Baurzhan Ismagulov
> 
> -- 
> You received this message because you are subscribed to a topic in the Google Groups "isar-users" group.
> To unsubscribe from this topic, visit https://groups.google.com/d/topic/isar-users/_FHjvycAyeg/unsubscribe <https://groups.google.com/d/topic/isar-users/_FHjvycAyeg/unsubscribe>.
> To unsubscribe from this group and all its topics, send an email to isar-users+unsubscribe@googlegroups.com <mailto:isar-users+unsubscribe@googlegroups.com>.
> To post to this group, send email to isar-users@googlegroups.com <mailto:isar-users@googlegroups.com>.
> To view this discussion on the web visit https://groups.google.com/d/msgid/isar-users/49365eab-5224-457b-271c-7e841eac08f3%40ilbers.de <https://groups.google.com/d/msgid/isar-users/49365eab-5224-457b-271c-7e841eac08f3%40ilbers.de>.
> For more options, visit https://groups.google.com/d/optout <https://groups.google.com/d/optout>.


[-- Attachment #2: Type: text/html, Size: 36837 bytes --]