From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6655521619015892992 X-Received: by 2002:a50:ad94:: with SMTP id a20mr448781edd.8.1549636114312; Fri, 08 Feb 2019 06:28:34 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:906:406:: with SMTP id d6ls1186277eja.7.gmail; Fri, 08 Feb 2019 06:28:33 -0800 (PST) X-Google-Smtp-Source: AHgI3IZr8j1S5edrprLa85iYKufmksDjKvHH1JjymC0XNDP3Hxdux6lk74F1l3XmmbmWgTsfuifW X-Received: by 2002:a17:906:3c3:: with SMTP id c3mr2732410eja.0.1549636113840; Fri, 08 Feb 2019 06:28:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1549636113; cv=none; d=google.com; s=arc-20160816; b=OrTXbZ3ovLrFh1l4bpjbsOr3fQ0amRozba3JqChzhIhv5Iv9GyFO3neY2YILFiAord 3/QO1ahjl0V0YHXYgjijsBdz+5AMDHgoOeeI3LqVBv5gXauVGs//VO1FGrAigGfKSjNX jomfieafoo49r8MhaBLv6DOFSu6+SooN75/uS+3Kh4A48tJyJxe87xj+rAIzUMtjoJbu l4lWnwF8uL7fKGUr8+RI+JcOFaN9rPvlcvGuGgpHvjTrLCYa7BkH49X2PrblBHtcU2Eo C+RpseIPMoKdaSqJ8jfOBA7Gi2r/BQ6vriMeNj1lAb8EhWuTD+s8pDPMKvW+XJzpW0lu X7KA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:subject:cc:to:from:date; bh=V39TthQUrqHrhfX1jCupFB9anZim2GXtTUwfaWEAHyo=; b=pCntWdwHJa8EkaWUClVFa0Cz1m5vpqYUwPEc9lfadBgP8qvDQf0de2/eO8IBQYS/4g +kRUuv0Hdx+0KBwG2uZ4vDNbDUgWIExY//IhUJR7u1MM+CM0qSsPawS1Y9uts7dyMNf8 tcN+0WwPnTKvwPaQOtDa2+vmFU3/Qt5o7vNbzCv+v/Fh3Q8AA6+nmv/HwtqZsXK1+YoA GAdKBlIv58KXReL5aux+6FcZaQDIVrcoHY6X4nd4qr9rdgCx3w+59rkjdOZMuEzWDt0K k5kyjnyVfjnhgm4AndrfTSD0EKV8cSd/14wJWFy2xhtEKUTUL/3JVOPCB4VMDKUUqLnP G24A== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=henning.schild@siemens.com Return-Path: Received: from thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id b64si112119edf.5.2019.02.08.06.28.33 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 08 Feb 2019 06:28:33 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.2 as permitted sender) client-ip=192.35.17.2; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=henning.schild@siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id x18ESW42017725 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 8 Feb 2019 15:28:32 +0100 Received: from md1za8fc.ad001.siemens.net ([139.25.0.64]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id x18ESX7M012969; Fri, 8 Feb 2019 15:28:33 +0100 Date: Fri, 8 Feb 2019 15:28:32 +0100 From: Henning Schild To: Cedric Hombourger Cc: Subject: Re: [PATCH] wic-img: handle variables in .wks files Message-ID: <20190208152832.4a1a88b2@md1za8fc.ad001.siemens.net> In-Reply-To: <1549609367-1025-1-git-send-email-Cedric_Hombourger@mentor.com> References: <1549609367-1025-1-git-send-email-Cedric_Hombourger@mentor.com> X-Mailer: Claws Mail 3.15.0-dirty (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-TUID: MFGtdmQq4020 Not sure i get all the context right ... But if you are introducing a template mechanism to generate .wks files, have a look at the patches from Claudius that are currently pending. He introduces a generic templating mechanism which may be useful for generating .wks files as well. [PATCH v2 1/1] meta: added do_transform_template task as templating system and switch You could give that a try and maybe still vote for or against that mechanism. At the moment i would say it is likely to go in, and consequently other/future templating mechanism will we be questioned. Henning Am Fri, 8 Feb 2019 08:02:47 +0100 schrieb Cedric Hombourger : > Isar will now generate .wks from user-specified templates with > variables such as $ROOTFS_TYPE or $ROOTFS_SIZE replaced with their > values. Custom variables may be substituted by adding them to WKSVARS > (WKSVAR += FOO) > > Signed-off-by: Cedric Hombourger > --- > doc/user_manual.md | 2 ++ > meta/classes/wic-img.bbclass | 31 ++++++++++++++++++++++++++++++- > 2 files changed, 32 insertions(+), 1 deletion(-) > > diff --git a/doc/user_manual.md b/doc/user_manual.md > index ebc31c6..ea3b4bd 100644 > --- a/doc/user_manual.md > +++ b/doc/user_manual.md > @@ -197,6 +197,8 @@ A bootable disk image is generated if you set > IMAGE_TYPE to 'wic-img'. Behind th $ bitbake > multiconfig:qemuamd64-stretch:isar-image-base ``` > > +Note: `.wks` files may use the ROOTFS_SIZE and ROOTFS_TYPE variables > (as well as any other bitbake variables added to WKSVARS). + > In order to run the EFI images with `qemu`, an EFI firmware is > required and available at the following address: > https://github.com/tianocore/edk2/tree/3858b4a1ff09d3243fea8d07bd135478237cb8f7 > diff --git a/meta/classes/wic-img.bbclass > b/meta/classes/wic-img.bbclass index 76602d8..16bbc53 100644 > --- a/meta/classes/wic-img.bbclass > +++ b/meta/classes/wic-img.bbclass > @@ -81,6 +81,32 @@ 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' > > +WKSVARS += "ROOTFS_SIZE ROOTFS_TYPE" > + > +python do_rootfs_wksenv () { > + wksvars = d.getVar('WKSVARS', True) > + if not wksvars: > + return > + > + stdir = d.getVar('STAGING_DIR', True) > + outdir = os.path.join(stdir, d.getVar('MACHINE', True), > 'imgdata') > + bb.utils.mkdirhier(outdir) > + basename = d.getVar('IMAGE_BASENAME', True) > + with open(os.path.join(outdir, basename) + '-wks.sh', 'w') as > envf: > + for var in wksvars.split(): > + value = d.getVar(var, True) > + if value: > + envf.write('%s="%s" \\\n' % (var, value.strip())) > + envf.write("envsubst '") > + for var in wksvars.split(): > + envf.write('$%s ' % var) > + envf.write("'\n") > +} > + > +addtask do_rootfs_wksenv after do_rootfs_wicenv before do_wic_image > +do_rootfs_wksenv[vardeps] += "${WKSVARS}" > +do_rootfs_wksenv[prefuncs] = 'set_image_size' > + > WIC_IMAGE_FILE ="${DEPLOY_DIR_IMAGE}/${IMAGE_FULLNAME}.wic.img" > > do_build[stamp-extra-info] = "${DISTRO}-${DISTRO_ARCH}" > @@ -99,8 +125,11 @@ do_wic_image() { > export BUILDDIR=${BUILDDIR} > export MTOOLS_SKIP_CHECK=1 > > + /bin/sh > ${STAGING_DIR}/${MACHINE}/imgdata/${IMAGE_BASENAME}-wks.sh \ > + <${WKS_FULL_PATH} > >${BUILDCHROOT_DIR}/tmp/${IMAGE_FULLNAME}.wks + > sudo -E chroot ${BUILDCHROOT_DIR} \ > - ${ISARROOT}/scripts/wic create ${WKS_FULL_PATH} \ > + ${ISARROOT}/scripts/wic create /tmp/${IMAGE_FULLNAME}.wks \ > --vars "${STAGING_DIR}/${MACHINE}/imgdata/" \ > -o /tmp/${IMAGE_FULLNAME}.wic/ \ > -e ${IMAGE_BASENAME} ${WIC_CREATE_EXTRA_ARGS}