Re: [PATCH v2 2/3] Revert "image.bbclass: make KERNEL_IMAGE & INITRD_IMAGE variable fixed"

["Maxim Yu. Osipov" <mosipov@ilbers.de>]

On 5/13/19 9:31 AM, Claudius Heine wrote:
> Hi Maxim,
> 
> On 12/05/2019 21.30, Maxim Yu. Osipov wrote:
>> This reverts commit b92589c574596ac98f97cf14369cbf62872e6481.
>>
>> vmlinuz and initrd are getting overwritten for the same machine
>> by other distros under deploy/images/${MACHINE}
> 
> NACK. I don't see a patch that addresses the issue described in the 
> commit message of that reverted patch in this patchset in a different 
> way, so this is a regression.


Do you confirm that issue #53 appeared after applying your series into 
the 'next'?

just look in
http://isar-build.org:8080/job/isar_next/ws/build/tmp/deploy/images/qemuarm/

vmlinuz/initrd for stretch was overwritten by subsequent build for buster.

Regards,
Maxim.

> regards,
> Claudius
> 
>>
>> Closes: #56
>> Signed-off-by: Maxim Yu. Osipov <mosipov@ilbers.de>
>> ---
>>   meta/classes/image.bbclass | 6 ++++--
>>   1 file changed, 4 insertions(+), 2 deletions(-)
>>
>> diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
>> index fb35a4c..8e6f2c9 100644
>> --- a/meta/classes/image.bbclass
>> +++ b/meta/classes/image.bbclass
>> @@ -13,8 +13,8 @@ IMAGE_INSTALL += "${@ ("linux-image-" + 
>> d.getVar("KERNEL_NAME", True)) if d.getV
>>   IMAGE_FULLNAME = "${PF}"
>>   # These variables are used by wic and start_vm
>> -KERNEL_IMAGE ?= "vmlinuz"
>> -INITRD_IMAGE ?= "initrd.img"
>> +KERNEL_IMAGE ?= "${@get_image_name(d, 'vmlinuz')[1]}"
>> +INITRD_IMAGE ?= "${@get_image_name(d, 'initrd.img')[1]}"
>>   # Useful variables for imager implementations:
>>   PP = "/home/builder/${PN}"
>> @@ -149,10 +149,12 @@ addtask rootfs_install before do_build after 
>> do_unpack
>>   do_copy_boot_files[dirs] = "${DEPLOY_DIR_IMAGE}"
>>   do_copy_boot_files() {
>> +    KERNEL_IMAGE=${@get_image_name(d, 'vmlinuz')[1]}
>>       if [ -n "${KERNEL_IMAGE}" ]; then
>>           cp -f ${IMAGE_ROOTFS}/boot/${@get_image_name(d, 
>> 'vmlinuz')[0]} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE}
>>       fi
>> +    INITRD_IMAGE=${@get_image_name(d, 'initrd.img')[1]}
>>       if [ -n "${INITRD_IMAGE}" ]; then
>>           sudo cp -f ${IMAGE_ROOTFS}/boot/${@get_image_name(d, 
>> 'initrd.img')[0]} ${DEPLOY_DIR_IMAGE}/${INITRD_IMAGE}
>>       fi
>>
> 


-- 
Maxim Osipov
ilbers GmbH
Maria-Merian-Str. 8
85521 Ottobrunn
Germany
+49 (151) 6517 6917
mosipov@ilbers.de
http://ilbers.de/
Commercial register Munich, HRB 214197
General Manager: Baurzhan Ismagulov