RE: [PATCH] wic-img: handle variables in .wks files

["Hombourger, Cedric" <Cedric_Hombourger@mentor.com>]

Hi Jan,

JFYI - it does not seem to work out of the box with Isar (despite the variables that I wanted expanded being present in the .env file we are passing to wic via --vars)
The magic is done by the image_types_wic class, see below for specifics

Will import this code in Isar so we are better aligned and post a v2

Cedric

python do_write_wks_template () {
    """Write out expanded template contents to WKS_FULL_PATH."""
    import re

    template_body = d.getVar('_WKS_TEMPLATE')

    # Remove any remnant variable references left behind by the expansion
    # due to undefined variables
    expand_var_regexp = re.compile(r"\${[^{}@\n\t :]+}")
    while True:
        new_body = re.sub(expand_var_regexp, '', template_body)
        if new_body == template_body:
            break
        else:
            template_body = new_body

    wks_file = d.getVar('WKS_FULL_PATH')
    with open(wks_file, 'w') as f:
        f.write(template_body)
}

python () {
    if d.getVar('USING_WIC'):
        wks_file_u = d.getVar('WKS_FULL_PATH', False)
        wks_file = d.expand(wks_file_u)
        base, ext = os.path.splitext(wks_file)
        if ext == '.in' and os.path.exists(wks_file):
            wks_out_file = os.path.join(d.getVar('WORKDIR'), os.path.basename(base))
            d.setVar('WKS_FULL_PATH', wks_out_file)
            d.setVar('WKS_TEMPLATE_PATH', wks_file_u)
            d.setVar('WKS_FILE_CHECKSUM', '${WKS_TEMPLATE_PATH}:True')
           
            <snip> magic continues</snip>

            bb.build.addtask('do_write_wks_template', 'do_image_wic', None, d)

-----Original Message-----
From: Jan Kiszka [mailto:jan.kiszka@siemens.com] 
Sent: Friday, February 8, 2019 8:53 AM
To: Hombourger, Cedric <Cedric_Hombourger@mentor.com>; isar-users@googlegroups.com
Subject: Re: [PATCH] wic-img: handle variables in .wks files

On 08.02.19 08:48, [ext] Jan Kiszka wrote:
> On 08.02.19 08:44, Hombourger, Cedric wrote:
>> I will double check but WICVARS are for variables you wish to export 
>> to wic plugins This interface is for variables we would to make 
>> available inside .wks files
> 
> There is no WKSVARS in OE, while you can use variables, see e.g. 
> scripts/lib/wic/canned-wks/directdisk.wks.
> 

Sorry, I meant scripts/lib/wic/canned-wks/efi-bootdisk.wks.in.

Jan

--
Siemens AG, Corporate Technology, CT RDA IOT SES-DE Corporate Competence Center Embedded Linux