From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6716855539805978624 X-Received: by 2002:adf:cd84:: with SMTP id q4mr6131550wrj.232.1563895496386; Tue, 23 Jul 2019 08:24:56 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a5d:428f:: with SMTP id k15ls12943569wrq.7.gmail; Tue, 23 Jul 2019 08:24:55 -0700 (PDT) X-Google-Smtp-Source: APXvYqztGr96ZqQqzn3n8750Q67uNwkw2La8aP7fKs2pvB/iU3PSw393UQjczGOE9jY0pyn0WGjx X-Received: by 2002:adf:dfc5:: with SMTP id q5mr26150849wrn.142.1563895495812; Tue, 23 Jul 2019 08:24:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1563895495; cv=none; d=google.com; s=arc-20160816; b=Cj3nQoM1Rggup0tNyHJu1uIUKNzVD/B3ptPOaWUmCSxlRJ6fQY68YAyiaNIvmBa/RY XR9RW0sf1Qmj4BoLCYceqICo//WHw8Uz+073I9Y3OXgHIr7S4OT1/mfGkYgJaxMIZfDj nYM1nONWDvcbjSgQCzZsVwUO7pcjpz7kUA8N4CPERdEb2/icldmbWAKJDLjt2EFUCu0k zVm3oNovHrdNNlnw+gyFXkX27/2dDXJWjZ8qqeS4PVEYFsOLAjAek85LBdQUXSLbzeoo CAaWnmpcnS+UAihjnLi11WZxstxBKPtokNWhdQbcc2JYabLGh4KIbV3gYzWh+nrERZ7x +21Q== 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=v2Y9XXjYD9SzB9/ME9t8wvfC3NfXdEdDGIMnzy1OWME=; b=1FgMYJAlPWhuBpiv0VwF1IiV7lnlLNmGBHXiiZoGbNLixl+nPkuZ5xhtLj08EfHHaW +oiPF1kgpyvV0pM3SmFNYcWVP2kiG3MSZ7RUy0UCA74TAuw67f9zi5hr4xMx+ddCT0+8 URZBEma+bnt4+lbLJgN0R6iAg/RRG353wRB4mcZLCtnHYD+wqeAY9nZeXLc62igiJPtR jt8PdfPaeaNk10w+o2vUL1z1h32lDT0wT/NjjaDDzRESSyout/ZCXEO0zHKi3Y0hYdWW 64cMP83oLE3eD9KSahL0XIOVKcocNeZa0QglR/Ms+7d/Xn6vcD9btKKSI7cFUb43j8oU 5SVA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=jan.kiszka@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 f13si2393125wmc.3.2019.07.23.08.24.55 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 23 Jul 2019 08:24:55 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@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 jan.kiszka@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=jan.kiszka@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 x6NFOtNT013420 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 23 Jul 2019 17:24:55 +0200 Received: from [139.25.68.37] (md1q0hnc.ad001.siemens.net [139.25.68.37] (may be forged)) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id x6NFOtXJ003814; Tue, 23 Jul 2019 17:24:55 +0200 Subject: Re: [PATCH] meta/classes:Add wic tooling for related images To: Henning Schild , Quirin Gylstorff Cc: isar-users@googlegroups.com References: <20190723134947.20714-1-quirin.gylstorff@siemens.com> <20190723161850.0bdb81eb@md1za8fc.ad001.siemens.net> <20190723171518.58ec9d7b@md1za8fc.ad001.siemens.net> From: Jan Kiszka Message-ID: Date: Tue, 23 Jul 2019 17:24:55 +0200 User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 MIME-Version: 1.0 In-Reply-To: <20190723171518.58ec9d7b@md1za8fc.ad001.siemens.net> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: OFHJXRz6Tz2H On 23.07.19 17:15, Henning Schild wrote: > Am Tue, 23 Jul 2019 16:42:42 +0200 > schrieb Quirin Gylstorff : > >> 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. > > 8c4d3ed8d751a946d is coming from Jan and i could not figure out why he > did not do what you propose here. Jan could you comment on this one? > I don't remember any obvious reason. If things work now, and we should have plenty of test cases for this, this change is fine. Jan > Going back further we have cab9c6488821 inventing IMAGER_INSTALL and > the first wic implementation before that 5026e58f08aba98a. > > Henning > >> 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 >>> > -- Siemens AG, Corporate Technology, CT RDA IOT SES-DE Corporate Competence Center Embedded Linux