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

[Claudius Heine <claudius.heine.ext@siemens.com>]

Hi Quirin,

On 23/07/2019 17.04, [ext] Quirin Gylstorff wrote:
> 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..f3c29dc 100644
> --- a/meta/classes/wic-img.bbclass
> +++ b/meta/classes/wic-img.bbclass
> @@ -11,6 +11,9 @@ do_copy_wks_template () {
>       cp -f '${WKS_TEMPLATE_PATH}' '${WORKDIR}/${WKS_TEMPLATE_FILE}'
>   }
>   
> +
> +
> +

Well that looks odd ;)

Cheers,
Claudius

>   python () {
>       import itertools
>       import re
> @@ -78,6 +81,7 @@ python () {
>   
>   inherit buildchroot
>   
> +IMAGER_INSTALL += "${WIC_IMAGER_INSTALL}"
>   # wic comes with reasonable defaults, and the proper interface is the wks file
>   ROOTFS_EXTRA ?= "0"
>   
> 

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-54 Fax: (+49)-8142-66989-80 Email: ch@denx.de