From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6716855539805978624 X-Received: by 2002:a17:906:4717:: with SMTP id y23mr57866108ejq.150.1563894296990; Tue, 23 Jul 2019 08:04:56 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:906:2f11:: with SMTP id v17ls9103099eji.6.gmail; Tue, 23 Jul 2019 08:04:56 -0700 (PDT) X-Google-Smtp-Source: APXvYqxUreLFhhTOYWvcZql7nWJmhyNBRwUhvdd8fMigafdZjiVOVSa956x2Hu5fQGh8ESFPH4bw X-Received: by 2002:a17:906:504e:: with SMTP id e14mr58660011ejk.204.1563894296608; Tue, 23 Jul 2019 08:04:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1563894296; cv=none; d=google.com; s=arc-20160816; b=ogGB1Toxuc4knBRFQQtuGwt/EInR7QAJ7DjMuI+VVrg63caoH7OLrFHrOG7Qs1X+nN D9KHMeIy62iGnmgntZKFWwOAq1Seo7J32UZRTbuH7P5rdo4mjLLLIeky3xq+yPxPpxpZ 4WbNFYr967SMQiHva/n5f8pWcSH0n/2qH5w0BnYlltngDRcukp4L3ZJb6MUNZjGIgkjR VKjuz4JcmCjo5GLaqBeLnIAZQetpIBE70zmMHLVRVrcqsvGULaOtzARdn27RhfU+gP07 Xmmaipx5wnTTQrnE2sUjPfYASFidtmqXlJLbqf6bRRij+r2nak7AaPV5Kxv0T1pT+YEU H9DA== 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:date:subject:to:from; bh=YYhrnPtkjmjJB57aD71heVHHgPJl5MNhr1c+GbWcrsA=; b=OkWKOScaQQ3LolFRCnfo84rJg5VHOQA1JSyrBpQVoyxQWAlUs6aLk6up8r+N4IZv69 TatEYDBOn8bPwl9FQ9fmBk8naiUtkAWCZVlyoSlcC6dEi3vI8HSfM8Ok2A5hloVXr8nH wUMLXScM4XtKf8YCIpoj1qB50a4JOYabp9B765kQO42+oI9QOVpAA0Iu5nv224CfMyV0 AUKH2QIWYyECpvkGZQ+ISA1l+RMeOjOH63caZA6k2ZQqUFTG3mE9Am5wI9lcpvNjeu6R YhWkyQNyjYcAZFewDGv4Izp8uKvYgh8LsdGKxU4vupw/BVPQdgbQDT2Vx/NU8+AZt5Lw mWjw== 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 a41si2308355edc.5.2019.07.23.08.04.56 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 23 Jul 2019 08:04:56 -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 mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id x6NF4ulO029551 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 23 Jul 2019 17:04:56 +0200 Received: from debian.ad001.siemens.net ([139.25.68.238]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id x6NF4uhn016117 for ; Tue, 23 Jul 2019 17:04:56 +0200 From: Quirin Gylstorff To: isar-users@googlegroups.com Subject: [PATCH v2] meta/classes:Add wic tooling for related images Date: Tue, 23 Jul 2019 17:04:45 +0200 Message-Id: <20190723150445.31970-1-quirin.gylstorff@siemens.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190723134947.20714-1-quirin.gylstorff@siemens.com> References: <20190723134947.20714-1-quirin.gylstorff@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: Gc1DwIVYSTl5 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..f3c29dc 100644 --- a/meta/classes/wic-img.bbclass +++ b/meta/classes/wic-img.bbclass @@ -11,6 +11,9 @@ do_copy_wks_template () { cp -f '${WKS_TEMPLATE_PATH}' '${WORKDIR}/${WKS_TEMPLATE_FILE}' } + + + python () { import itertools import re @@ -78,6 +81,7 @@ python () { inherit buildchroot +IMAGER_INSTALL += "${WIC_IMAGER_INSTALL}" # wic comes with reasonable defaults, and the proper interface is the wks file ROOTFS_EXTRA ?= "0" -- 2.20.1