From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6716855539805978624 X-Received: by 2002:a50:fd0c:: with SMTP id i12mr68088889eds.55.1563889798357; Tue, 23 Jul 2019 06:49:58 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:906:7a05:: with SMTP id d5ls9039812ejo.13.gmail; Tue, 23 Jul 2019 06:49:58 -0700 (PDT) X-Google-Smtp-Source: APXvYqwmgVQhmemWrCVSfbCRdU9UpfOseRJBU1fOrV6jFQyvaQW4zpFAyqW5Yk9Ch7r42qVjgzSb X-Received: by 2002:a17:906:1303:: with SMTP id w3mr44472434ejb.143.1563889797999; Tue, 23 Jul 2019 06:49:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1563889797; cv=none; d=google.com; s=arc-20160816; b=jxH4S0h5cTVcuLvM9276YEBN8a/172tdfY0c18PBUzeA4KNAbZwtAAegh6RsJSql3c Y57y6CI1Aoix6DfuSCGub4a4/8fPa+BV0I0yTeomfTDzmP3KnZnIZfla56tsHKRk9YU0 PMRvqkE14B4Wh1E7BxIQOscRkfeTwbKUyNSSbz9XYHV2jTelAmVEVZjZq2EjdmLZ9Fj9 YmW9792RuI+9aDQoocPg/rZFJ9RECfvOAyUcyHNfdozy5xes2lakLK3iKoVmky2810L/ /fWvzQ9qxGm4pySJE68w8YAD2UZsnZcBSQScVf/2PEnKzprRr6su0nVu7g3OhqbyowAr CcEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from; bh=/NwElIi5gw5XIn5KTVu9/nFSeN5xEm3KiTiWEq0jnvg=; b=NVNp6/HOPnyR9MsVyjps6lDMb3tMndZkGmzN4RSg6Gjkbjx/Ri5b/T9hOX/oP+iWke d7uCT58831mHpTUSG91OIKk3me8HK79L2PBcTsYRLbEr1D+5ZK/CyzBHRcfawjSN/nci LZcynf+1AGq8DFa4qsEaGmDOM5ss7zTWUHA+3kE/pNn0XdPl19Cnomz+s3bDOVsZCzhJ FZljYx94AUC96SpeC/9zNHYFeDejBLUBLIQvJGF3Uoi5Cp9WJV1BH2bnZ669t5Xnaos+ iSyR1rcmpsBJXNHBPZEMGSOtU1qcr/sLTe2JFT5yGNguMqG8b4jkIGjF6Nnh9djF8oVQ qBOg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of quirin.gylstorff@siemens.com designates 192.35.17.14 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 david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id b39si2395349edb.1.2019.07.23.06.49.57 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 23 Jul 2019 06:49:57 -0700 (PDT) Received-SPF: pass (google.com: domain of quirin.gylstorff@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 quirin.gylstorff@siemens.com designates 192.35.17.14 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 david.siemens.de (8.15.2/8.15.2) with ESMTPS id x6NDnv7L031090 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 23 Jul 2019 15:49:57 +0200 Received: from debian.ad001.siemens.net ([139.25.68.238]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id x6NDnvqY027160 for ; Tue, 23 Jul 2019 15:49:57 +0200 From: Quirin Gylstorff To: isar-users@googlegroups.com Subject: [PATCH] meta/classes:Add wic tooling for related images Date: Tue, 23 Jul 2019 15:49:47 +0200 Message-Id: <20190723134947.20714-1-quirin.gylstorff@siemens.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: UJOmO5q7Cd8J 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 -- 2.20.1