From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6716855539805978624 X-Received: by 2002:a17:906:fc5:: with SMTP id c5mr24848786ejk.129.1564050063767; Thu, 25 Jul 2019 03:21:03 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a50:aeee:: with SMTP id f43ls11640465edd.15.gmail; Thu, 25 Jul 2019 03:21:03 -0700 (PDT) X-Google-Smtp-Source: APXvYqxgdZBwEZh1ELjkFwFhOykVLN7BXs+L24Gz4vpdnPKmpFPl0LgLajbFGN73EsugvaZy0JHh X-Received: by 2002:aa7:c49a:: with SMTP id m26mr78148353edq.0.1564050063281; Thu, 25 Jul 2019 03:21:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564050063; cv=none; d=google.com; s=arc-20160816; b=uOdIjgSE6WA6SI0jGQ+PE/IpiTB+6OQQ5N8+0zI8TM2DqsAAbA0gFlzHvcNVSyeBrY cXsG7LOhkQVSmRSHPjAwAHM7fT4mdaP+dcydB5WNsyvH9g4tK6bGN4z24KGSecpfBcGr aPwrf8Yo4ONd2CCR3fBZH6rYjrETty4AWkzwqii8OwOnp8afnZC5Kn83We71Jj5ybfpI ikJnsx5dtRlQSbuBZtSEjd3nxD7SZg9lWTliVboHNIlaRjyYOZW29WJYMgtmtlNTCCzF aYf75mUPNxIdBEAKUJSxtwWaHMn6bXvANGnh3vcbbVHIowNjNV4uTGZfzprLHbu7U3ii nw4A== 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:cc:to:from; bh=3r76mh3qr38amX0GAy0HVuncuzga+NcZ/XR0L6phiDg=; b=oU62q42/MlSVYBuB6peRewgxuxoI+Y4AvRbl9Ort3dojQ3V4WMoqQq3dKK1nnPogdS gE08GqCu55422YwQ6HNFG0+ndI+/PskNDq+uzTDM7NAbpbfVry5TUOhLM5q1lBo9zUcE XBSpxguNUeH8luP6Oh3UPZNBtXbVpRhC61RayJBpHTkEtgbcJlMMgqIykTqX/D2Rw30k fi7qjHiiRzmEbHS/sKfhP8igBf3AkVY6KtBtrC1Jt4aQH8YP1+Pgv9MMrSET3lwjoXc7 XMR3kPnLuwGbooKpWYd5lozojUF9zUAEFMc/j5KeeiG9pfWNoIJ+vEAyjN2IGK8SLQpI yyHw== 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 b39si2686153edb.1.2019.07.25.03.21.03 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 25 Jul 2019 03:21:03 -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 mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by gecko.sbs.de (8.15.2/8.15.2) with ESMTPS id x6PAL2Td009277 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 25 Jul 2019 12:21:02 +0200 Received: from debian.ad001.siemens.net ([139.25.68.238]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id x6PAL2Gl008397; Thu, 25 Jul 2019 12:21:02 +0200 From: Quirin Gylstorff To: isar-users@googlegroups.com Cc: Claudius Heine Subject: [PATCH v3] meta/classes:Add wic tooling for related images Date: Thu, 25 Jul 2019 12:20:50 +0200 Message-Id: <20190725102050.3191-1-quirin.gylstorff@siemens.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: vKtaNVR17sfG 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 --- Changes in v3: - remove empty lines Changes in v2: - move below inherit buildchroot meta/classes/image-tools-extension.bbclass | 6 ------ meta/classes/wic-img.bbclass | 1 + 2 files changed, 1 insertion(+), 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..1ccbe55 100644 --- a/meta/classes/wic-img.bbclass +++ b/meta/classes/wic-img.bbclass @@ -78,6 +78,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