From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6670812072384659456 X-Received: by 2002:a17:906:9701:: with SMTP id k1mr351904ejx.13.1553169468608; Thu, 21 Mar 2019 04:57:48 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:906:3d62:: with SMTP id r2ls1006428ejf.2.gmail; Thu, 21 Mar 2019 04:57:48 -0700 (PDT) X-Google-Smtp-Source: APXvYqzWxMow1br4iAOHEYQQd5NtkM8lIT4AlEFEe7bCyEY8CWnbEy9DJPUQ+g1Ki5eZU7fW1iZL X-Received: by 2002:a17:906:5985:: with SMTP id j5mr356117ejq.8.1553169468001; Thu, 21 Mar 2019 04:57:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553169467; cv=none; d=google.com; s=arc-20160816; b=MPhhjumgGXH9DMxWHiQemBqSg3FaXpZBwU+ueLfLphHUpVWuX0xOl0GdNlwmZHaQE7 /vfrUl1a04VZF+zEsTxD8JHuQc3YaO04ZRIOCdZ0qhTVBiNL2cJXfEdgZzmyNHxO5tWx hv1RVcGXRIPFfBL3koDcLwzXDc6LW+BElpULcW6CNlbI0aMKhwJofcTl0fkjvALX/XZc UeR7Z9swDBWveCMYjU+enEJlV1VE4SV0pnR97ER4wQ8skXFHWNLkk0Xe+OeDMFLhFDQa TpwyPlyHTZX8Rjy9kWJOZ+7+SYih5xkAVnbtVWSW4az4+tsnaC3PK47Xi2pduHvL/uY1 qfuA== 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=WPSBJXOQnqUlaeC9+e+omE94wXowZWpDUrPflmu38z4=; b=eB/qX+rPsdon2c/LEqrP+4nzdqY3T6rdo0IbJQZUUbWELvd+6ZPM/MgYfOONeOv4xj 7S1MxiOl1zvGLuwybbaGvya8y0Smz6JBqg/aAFJ3hBF+X9sNoF30HdGfjuH1/PfFWG9K pRidJoPIcSA2ax4z0XPHUMv5BxZiNPIi6dYW9Pu4p/0luI2YQVSUJ2+NLUFC0WG5qjS/ gh/O/JvGdM1N8QVihziqohLFY6WkQn68oAbOEKralzx0EwlkYD++I9J9/ww2Z2KNwzmu ZhI3HJtAmClOTjFkat4SLWZtfhQQPeEEiHAH5nj4NSn4O3/MfWBnVRNxnRkJkBHyfPQl 9bOw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of claudius.heine.ext@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=claudius.heine.ext@siemens.com Return-Path: Received: from goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id r10si192652eda.4.2019.03.21.04.57.47 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 21 Mar 2019 04:57:47 -0700 (PDT) Received-SPF: pass (google.com: domain of claudius.heine.ext@siemens.com designates 192.35.17.28 as permitted sender) client-ip=192.35.17.28; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of claudius.heine.ext@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=claudius.heine.ext@siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id x2LBvlsG024189 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 21 Mar 2019 12:57:47 +0100 Received: from ring.ppmd.siemens.net (linux-ses-ext02.ppmd.siemens.net [139.25.69.232]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id x2LBvkgv005142; Thu, 21 Mar 2019 12:57:46 +0100 From: claudius.heine.ext@siemens.com To: isar-users@googlegroups.com Cc: Claudius Heine Subject: [PATCH v2 2/2] deprecate isar-image Date: Thu, 21 Mar 2019 12:57:40 +0100 Message-Id: <20190321115740.17459-3-claudius.heine.ext@siemens.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190321115740.17459-1-claudius.heine.ext@siemens.com> References: <20190321115740.17459-1-claudius.heine.ext@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: 873HnnTEi+Fe From: Claudius Heine This deprecates the isar-image class, the image class should be inherited instead. Signed-off-by: Claudius Heine --- RECIPE-API-CHANGELOG.md | 9 +++++++++ doc/user_manual.md | 2 +- meta-isar/recipes-core/images/isar-image-base.bb | 2 +- meta-isar/recipes-core/images/isar-image-ubi.bb | 2 +- meta/classes/isar-image.bbclass | 5 +++++ 5 files changed, 17 insertions(+), 3 deletions(-) diff --git a/RECIPE-API-CHANGELOG.md b/RECIPE-API-CHANGELOG.md index e5f3150..d389d99 100644 --- a/RECIPE-API-CHANGELOG.md +++ b/RECIPE-API-CHANGELOG.md @@ -145,3 +145,12 @@ a root password, leak that password via its script in /var/lib/dpkg/info. Instead set the CFG_ROOT_PW variable to the encrypted password and use the transient 'isar-cfg-rootpw' package (now installed as transient package per default). + +Changes in v0.8 +--------------- + +### `isar-image.bbclass` class will be deprecated in future version of isar + +The content of `isar-image.bbclass` was moved to the `image.bbclass` file. +Recipes that inherit `isar-image` should be modified to inherit from `image` +instead. diff --git a/doc/user_manual.md b/doc/user_manual.md index 9ea3f42..5e74927 100644 --- a/doc/user_manual.md +++ b/doc/user_manual.md @@ -534,7 +534,7 @@ IMAGE_PREINSTALL = " \ openssh-server \ " -inherit isar-image +inherit image ``` diff --git a/meta-isar/recipes-core/images/isar-image-base.bb b/meta-isar/recipes-core/images/isar-image-base.bb index c86e63b..b381d85 100644 --- a/meta-isar/recipes-core/images/isar-image-base.bb +++ b/meta-isar/recipes-core/images/isar-image-base.bb @@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = "file://${LAYERDIR_core}/licenses/COPYING.GPLv2;md5=751419260 PV = "1.0" -inherit isar-image +inherit image diff --git a/meta-isar/recipes-core/images/isar-image-ubi.bb b/meta-isar/recipes-core/images/isar-image-ubi.bb index 4b7e109..3b41f23 100644 --- a/meta-isar/recipes-core/images/isar-image-ubi.bb +++ b/meta-isar/recipes-core/images/isar-image-ubi.bb @@ -10,7 +10,7 @@ DESCRIPTION = "UBI Isar image" LICENSE = "gpl-2.0" LIC_FILES_CHKSUM = "file://${LAYERDIR_core}/licenses/COPYING.GPLv2;md5=751419260aa954499f7abaabaa882bbe" -inherit isar-image +inherit image SRC_URI += "file://ubinize.cfg.tmpl \ file://fitimage.its.tmpl" diff --git a/meta/classes/isar-image.bbclass b/meta/classes/isar-image.bbclass index 1d5870b..743ecbb 100644 --- a/meta/classes/isar-image.bbclass +++ b/meta/classes/isar-image.bbclass @@ -4,3 +4,8 @@ # Copyright (C) 2015-2018 ilbers GmbH # Copyright (c) Siemens AG, 2019 inherit image + +python() { + bb.warn("isar-image is deprecated, please change 'isar-image' inheritance " + "to 'image'.") +} -- 2.20.1