From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6716855539805978624 X-Received: by 2002:a5d:438e:: with SMTP id i14mr78239818wrq.122.1563892973342; Tue, 23 Jul 2019 07:42:53 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:a557:: with SMTP id o84ls15480941wme.3.gmail; Tue, 23 Jul 2019 07:42:52 -0700 (PDT) X-Google-Smtp-Source: APXvYqwAWn5B864QX7X2tTMAH3se/RdNe6Tu28q7bYvD0/BH16aMVYhRMpH0wHdWRZhqvYmjgiJv X-Received: by 2002:a1c:ac81:: with SMTP id v123mr71382865wme.145.1563892972890; Tue, 23 Jul 2019 07:42:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1563892972; cv=none; d=google.com; s=arc-20160816; b=YE4k1spk1ZcIuxv5jo2eAakhOhmXe8A/amniK0klj6aEEEST3Hbv1qHOrHsjlxX39d aEFXyvIK/nYMkaAIVYbAvMR0FjLSnU9Lv562ERmkAOvdcP8oED1MS3W/8WV9eZVKeMYJ 3vmL7iNj/8/1s1JJedBKlQEWEEXUaCjiCLwX4gzf8yaAdeZkYO4oV/Wo46WtSx88dmcJ wEcHFcBg+J6qwdYlEgcKznnX+mYGzFm7NnGUrEOGYAtsaMeMnYX2UR4FoPdkb2kWtQxB sQBtqzyV4qIPHP9X6vAwndxkqLT+tPyNynsub2iZuF9qAHPlEab+Xhwl17Y2LuaHCmr+ cXbw== 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=lSw2SJJEYjNVMS3LDCb4CKyHwl+iHwvrwnr1aFsAero=; b=qFGNsfHhAD4m2SWEy0ko/mDkK5EB1j7ZsraqVbLYexF3zqI5vqUCf7n/061eC3eyOg tBFZBGuINxt5jZIkXxzxOuwzfQ5Ql7lsoZ84u6taCZBDbrCECmYZJSTFGg9UbS+5NoCe x28xKbc7oJa+AkAZxHA5Sik6A1rxFH2Pj78uVCHs+2ldC64cYNobOTr3QC8yJVSmjMjW N7mYMh3NEelclGHUGTlAvvfY4mjITGDmtVAgTiFizsQ4m7m0iTSPtItShB88jErkETAN 2u+jB5bxRolCdfuE20y0yAUVSc6kq/XSxpS9whMVk9WRLCZPZZASCf269pxhxCOcXPnB 6mHw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of quirin.gylstorff@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=quirin.gylstorff@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 a10si2359506wmm.2.2019.07.23.07.42.52 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 23 Jul 2019 07:42:52 -0700 (PDT) Received-SPF: pass (google.com: domain of quirin.gylstorff@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 quirin.gylstorff@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=quirin.gylstorff@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 gecko.sbs.de (8.15.2/8.15.2) with ESMTPS id x6NEgqA7014901 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 23 Jul 2019 16:42:52 +0200 Received: from [139.25.68.238] ([139.25.68.238]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id x6NEgqYK026700; Tue, 23 Jul 2019 16:42:52 +0200 Subject: Re: [PATCH] meta/classes:Add wic tooling for related images To: Henning Schild Cc: isar-users@googlegroups.com References: <20190723134947.20714-1-quirin.gylstorff@siemens.com> <20190723161850.0bdb81eb@md1za8fc.ad001.siemens.net> From: Quirin Gylstorff Message-ID: Date: Tue, 23 Jul 2019 16:42:42 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.8.0 MIME-Version: 1.0 In-Reply-To: <20190723161850.0bdb81eb@md1za8fc.ad001.siemens.net> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: 5UJpqDZ1uv6c 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. 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 >