From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6716855539805978624 X-Received: by 2002:adf:a344:: with SMTP id d4mr5798854wrb.237.1563893808393; Tue, 23 Jul 2019 07:56:48 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:2d02:: with SMTP id t2ls15513398wmt.0.canary-gmail; Tue, 23 Jul 2019 07:56:48 -0700 (PDT) X-Google-Smtp-Source: APXvYqzOXpL+LBhGulITm0XzCOBJ0OhDgOYvQI5zAAl4vnX016Ed1cSI/xfJoz1x5OmdBHSM1VWp X-Received: by 2002:a1c:a8d7:: with SMTP id r206mr69916082wme.47.1563893807984; Tue, 23 Jul 2019 07:56:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1563893807; cv=none; d=google.com; s=arc-20160816; b=b31nZKRczmMRq1jeufrJ1lGYsQkvdDAMm80UL/9su9189T7enKOJx4FpvP06RJCK0S KZjnp0NCqo480tgG4+yjerhbvJsjxGuuLMRn6HNrwFLytxtdpKbl+ovAygq7UT9QDNUb g2kYs3G1+aWTECgaqd0mvlEsWxl7vY/F9P0IJdLJlM+XvRG8Y5I9HiqLcMTm0S9yaw1/ ncXxELFYgV++lWzVX7EwqX4/1ljDvv8sK6cCvOFAZN/2D2xV69uXST6jBMXsUbFdH5jX wasdAkMVTp25Rae0s1tkEJmg26XKpBn2y3zoFUtn8hCq2BqiYKntr9LzHabVvTi0hy5m QzMA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:content-language:in-reply-to:mime-version :user-agent:date:message-id:from:references:cc:to:subject; bh=iObwSimOe0ulR3xSKpNtJljyZAqWnL+bAyDq3Q2IkHU=; b=J5iM1AsfzPWqjOXEK9H2LFrEhurToTz6hqVNE8fM4kDzfBT0Pznb0xLPGwJgalV+f/ M66YWm2RDgjQUNTxVSJn8N9hA6vwLVPg4hHq252v64W3qyB6hDgxjhA/VjORGsbjUWCQ sGYwSq2vsEaGEOdCQCPDmXrBxhMECV6ULV38GWGWocEctZJ+s65bBne+QIdV0tb+N5JS mfUrACoy8ezi3SPRlS9SQGkOeQ3x2qhJDVyR7UEh8LaeGC2iOtBCxHBb7/YkTYj9eGW8 HHqm+M29mHen/FkvZWh8PYehA5PCogb20woEeApvA7kbeSLn+tGLvkzu+g5xAyEGIDeb DqDw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of claudius.heine.ext@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=claudius.heine.ext@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id 60si1136860wra.2.2019.07.23.07.56.47 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 23 Jul 2019 07:56:47 -0700 (PDT) Received-SPF: pass (google.com: domain of claudius.heine.ext@siemens.com designates 192.35.17.28 as permitted sender) client-ip=192.35.17.28; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of claudius.heine.ext@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=claudius.heine.ext@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id x6NEuldr004873 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 23 Jul 2019 16:56:47 +0200 Received: from [139.25.69.208] (linux-ses-ext02.ppmd.siemens.net [139.25.69.208]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id x6NEulDK017758; Tue, 23 Jul 2019 16:56:47 +0200 Subject: Re: [PATCH] meta/classes:Add wic tooling for related images To: "[ext] Quirin Gylstorff" , Henning Schild Cc: isar-users@googlegroups.com References: <20190723134947.20714-1-quirin.gylstorff@siemens.com> <20190723161850.0bdb81eb@md1za8fc.ad001.siemens.net> From: Claudius Heine Message-ID: Date: Tue, 23 Jul 2019 16:56:47 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.7.1 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit X-TUID: 06jldi9uHHA+ On 23/07/2019 16.42, [ext] Quirin Gylstorff wrote: > > > 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. Well this code was originally written in commit: 5026e58f08aba98a01f7bef160d0a3163219b6c4 Author: Henning Schild Date: Fri Apr 13 16:19:00 2018 +0200 images: New class wic-img for wic intregration This patch integrates wic into the bitbake workflow, wic will be used for the imaging step, no need to call it manually. After all the previous reverts we now use an unmodified version of wic. Issues: - wic was never integrated - you always had to build an ext4-img to create a wic image later - there was never a way to control the size of wic disks/partition, only directly in the wks - wic used to leak the hosts bootloader into the final image Impact: The patch solves the Issues, but drops the ability to manually start wic after bitbake. And it drops support for building wic images for Distros before stretch. Signed-off-by: Henning Schild 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" : >> >>> 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 >>> --- >>>   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 >> > -- 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