Re: [PATCH] meta/classes:Add wic tooling for related images

[Quirin Gylstorff <quirin.gylstorff@siemens.com>]

On 7/23/19 4:18 PM, Henning Schild wrote:
> I do not remember why it is done like that. The original code most
> likely came from me. But probably at a time where IMAGER_INSTALL did
> not yet exist. So it effectively messed with IMAGE_PREINSTALL.
> 
> Would have to go back in history and read changes. If my assumption
> (legacy left overs from before IMAGER_INSTALL) is correct this patch is
> probably correct. But maybe there is another reason.
> 
> Did you go back a few "git blame"s and read the commit messages and
> comments around the python function?
> 
> Henning


The code was originally created with commit 8c4d3ed8 to replace a 
workaround for the image creation. The commit switches to the 
IMAGER_INSTALL mechanism away from some hack. Afterwards the code moved 
to image-tools-extension.bbclass with commit 0f9ae5bc. Between these 
changes I did not find any comments why it is restricting the usage.

Quirin


> 
> Am Tue, 23 Jul 2019 15:49:47 +0200
> schrieb "[ext] Quirin Gylstorff" <quirin.gylstorff@siemens.com>:
> 
>> The dependencies for wic are only added if IMAGE_TYPE
>> is equal to "wic-img". If a image type depends on the
>> wic-image class it is no longer possible to build a
>> wic image.
>>
>> Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
>> ---
>>   meta/classes/image-tools-extension.bbclass | 6 ------
>>   meta/classes/wic-img.bbclass               | 4 ++++
>>   2 files changed, 4 insertions(+), 6 deletions(-)
>>
>> diff --git a/meta/classes/image-tools-extension.bbclass
>> b/meta/classes/image-tools-extension.bbclass index b8672d5..ca94d49
>> 100644 --- a/meta/classes/image-tools-extension.bbclass
>> +++ b/meta/classes/image-tools-extension.bbclass
>> @@ -14,12 +14,6 @@ IMAGER_INSTALL ??= ""
>>   IMAGER_BUILD_DEPS ??= ""
>>   DEPENDS += "${IMAGER_BUILD_DEPS}"
>>   
>> -python () {
>> -    if d.getVar('IMAGE_TYPE', True) == 'wic-img':
>> -        d.appendVar('IMAGER_INSTALL',
>> -                    ' ' + d.getVar('WIC_IMAGER_INSTALL', True))
>> -}
>> -
>>   do_install_imager_deps[depends] = "buildchroot-target:do_build"
>>   do_install_imager_deps[deptask] = "do_deploy_deb"
>>   do_install_imager_deps[lockfiles] += "${REPO_ISAR_DIR}/isar.lock"
>> diff --git a/meta/classes/wic-img.bbclass
>> b/meta/classes/wic-img.bbclass index 94f0b02..eee27b3 100644
>> --- a/meta/classes/wic-img.bbclass
>> +++ b/meta/classes/wic-img.bbclass
>> @@ -11,6 +11,10 @@ do_copy_wks_template () {
>>       cp -f '${WKS_TEMPLATE_PATH}' '${WORKDIR}/${WKS_TEMPLATE_FILE}'
>>   }
>>   
>> +
>> +IMAGER_INSTALL = ${WIC_IMAGER_INSTALL}
>> +
>> +
>>   python () {
>>       import itertools
>>       import re
>