From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6716855539805978624 X-Received: by 2002:aa7:dd09:: with SMTP id i9mr67667079edv.193.1563894919626; Tue, 23 Jul 2019 08:15:19 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:906:7a05:: with SMTP id d5ls9103157ejo.13.gmail; Tue, 23 Jul 2019 08:15:19 -0700 (PDT) X-Google-Smtp-Source: APXvYqwKV8MV+FULC+9T0OM0JW+6B+nJwylmQubSMh3mmgDqfV+DYNj8RrD6WkEL+egFATFRmc2m X-Received: by 2002:a17:906:b7d8:: with SMTP id fy24mr59758547ejb.230.1563894919365; Tue, 23 Jul 2019 08:15:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1563894919; cv=none; d=google.com; s=arc-20160816; b=WyQ1KR1dnFnV/L11kptFu++E5LkPyNlfC1L6B6ATLK/5WYgZn9NzcI8QC1emSyC6HP MQDtV5bGLDErF6DaOLMWjebg/0770fwqlPU+XeFc2xMtMMDuqK2qR5B8cIQ9PSUMtT5E T4H8vbwmcpF2TeNOl+yUzxM4sLnmojb22IrkZVkrU8kjHyXB1/mRqGuGrrfao0wPCQ3b 2N0IedzZmmUCD4uca+QFTRllIKlnpCoQI1ogFcUFn3haPIQXq+W82uaX4GTCrw3ohC5r V1SdzzlkXLgnXVZUNOUYr/6YSqAFAttmbVBYXyoSZgKNlyX6YyuHINnFl7bFOGD+WjJK 8sVw== 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=jXOKZ0XEGk8vCz9mwgSuhWeiMjMCGnaPqf7riDaPiYc=; b=oIgp83TJDDZb+KByC0s9qWMJ1Ut4ion3ARb2TuvckqpQVjV56GDkFU5m+2jQm7EEXs 7D/B0ditCjAkLIFtUIEHHyFjynb8apY1PtLdDNIWsPB/YxYziuURAxvaVydNgwJSTzQL lKKXHMuJbuJvzAD2MX/6ElOWAr11+PYnwIF151xET9mLVhHbCCn8sIUe61ab2Pn7szC+ pPDh3clNyhcEWwK1t+7P7OZWGnw2Z0Jj8Py8cyBESPwd1LlOOwXfngNQ5jv0y7Ragt/Z 6W6sTK/hMLC/cmU12fNx9euu+S487d07/INmr55wcC9dyfsRk6GvAWd8Z+x2wJMMp01H 2VAw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id 91si1156519edq.3.2019.07.23.08.15.19 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 23 Jul 2019 08:15:19 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.14 as permitted sender) client-ip=192.35.17.14; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id x6NFFILw000390 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 23 Jul 2019 17:15:18 +0200 Received: from md1za8fc.ad001.siemens.net ([139.25.69.220]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id x6NFFIRo001017; Tue, 23 Jul 2019 17:15:18 +0200 Date: Tue, 23 Jul 2019 17:15:18 +0200 From: Henning Schild To: Quirin Gylstorff , "Kiszka, Jan (CT RDA IOT SES-DE)" Cc: Subject: Re: [PATCH] meta/classes:Add wic tooling for related images Message-ID: <20190723171518.58ec9d7b@md1za8fc.ad001.siemens.net> In-Reply-To: References: <20190723134947.20714-1-quirin.gylstorff@siemens.com> <20190723161850.0bdb81eb@md1za8fc.ad001.siemens.net> X-Mailer: Claws Mail 3.17.3 (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: YApM8Ac4X9kP 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? 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 > >