From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6716855539805978624 X-Received: by 2002:ac2:44ce:: with SMTP id d14mr35637834lfm.143.1563891532657; Tue, 23 Jul 2019 07:18:52 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:6556:: with SMTP id z83ls4892922ljb.11.gmail; Tue, 23 Jul 2019 07:18:52 -0700 (PDT) X-Google-Smtp-Source: APXvYqxM6dBX5HJeCyP2uz8IYU2e2mAcoFp9sUrKea87zgt0drhQD+66iWVvTdbHG4nwPkUP5jHc X-Received: by 2002:a2e:5c09:: with SMTP id q9mr1912638ljb.120.1563891532170; Tue, 23 Jul 2019 07:18:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1563891532; cv=none; d=google.com; s=arc-20160816; b=WFDoOa5kGdId870f9jly2YjjvWn9LE1lWIkHDY3BgWIkpgY+YAHGQMyCsHeSQ2Z/SW wEexem3bIF6fKpA5D8NJzaZqsyMQCgfx7KGJL8Iu6KnJufqjYt5nlVR41fySFgtp0wfb W91rdOjgDtg4PWim+dBd1D7drf0DWMqNT+mJAMJb7AeOihpOQHcv9vs2drSqGDMv907P A37cJTAktd5kA6cYxINfhBt32G8G23M3FXvNwwyPOMpU3Bu6dPtsHZwLCcS9kt4rRmiF r9Dkep24jire8uxNOkbLGDgVXMZ4q//0u6AaULKcF7UCtHPLqKpy1PpeGUnLdTX0bpy8 IR+A== 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=H/45+/rAIWKyePHFV1x7S+RSfOw3r+tFIaCdgs6X5V4=; b=goY0b5Zp/ttP3uXFEmcQvN26WvmJQl3/6XCuRNWYNhW5q0PjZw+4moC6LHGTXMGCz5 NA74IPewXRgMO6ky+2Khzgj9WD6IUo7MvjkjLlCmQOEQA5DRVKOc7vLFR+tu+E/LhLNk ke0aY6xnuBkDgxTczY9i765qljWOMBgweLsX1BC6+XwXgl/CwJc2W9ID0Z9BOLeeMiwF LduEvhXkmvcu33KoOFIA7JfWZqipneQ1/eieYfUqgVY4kA4J470ySAPdjt6WwEHMAqJJ /k6Ws0fb4h+rV6LI6slHTPrbwbrgyyX7+Exknxdi4NmcHMcCLjtIbQp5tVwzVHam7H51 WD6g== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.40 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 gecko.sbs.de (gecko.sbs.de. [194.138.37.40]) by gmr-mx.google.com with ESMTPS id z18si1924549lfh.1.2019.07.23.07.18.52 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 23 Jul 2019 07:18:52 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.40 as permitted sender) client-ip=194.138.37.40; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.40 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 gecko.sbs.de (8.15.2/8.15.2) with ESMTPS id x6NEIp5I000844 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 23 Jul 2019 16:18:51 +0200 Received: from md1za8fc.ad001.siemens.net ([139.25.69.220]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id x6NEIpwU031340; Tue, 23 Jul 2019 16:18:51 +0200 Date: Tue, 23 Jul 2019 16:18:50 +0200 From: Henning Schild To: "[ext] Quirin Gylstorff" Cc: Subject: Re: [PATCH] meta/classes:Add wic tooling for related images Message-ID: <20190723161850.0bdb81eb@md1za8fc.ad001.siemens.net> In-Reply-To: <20190723134947.20714-1-quirin.gylstorff@siemens.com> References: <20190723134947.20714-1-quirin.gylstorff@siemens.com> 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: qZyh/ewAI+w5 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 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