From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7062708050763710464 X-Received: by 2002:a05:6000:2c6:: with SMTP id o6mr2301667wry.585.1644414863228; Wed, 09 Feb 2022 05:54:23 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:8bda:: with SMTP id w26ls103724wra.1.gmail; Wed, 09 Feb 2022 05:54:22 -0800 (PST) X-Google-Smtp-Source: ABdhPJxt4UUuCjtRo5uv3CnYCOgum4xNwH1ST8IYhnl/efX0/Ky55jkj6IFN3O2zmLeu9MCC7uwL X-Received: by 2002:a05:6000:1633:: with SMTP id v19mr2125054wrb.677.1644414862399; Wed, 09 Feb 2022 05:54:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644414862; cv=none; d=google.com; s=arc-20160816; b=skhZmUQk+EdZM/53kKk4e2eKdGLKQ870yoRCGUgkTqDINhHjFB10T27AWEx21Qbxgj 6iMmNuWDZDISlQ7wDs/PO6FrXJG4bGtRjZGxda1QLimWm1gTDvKbWtdCsCt9i9I/Xtdg SkUfmADBnj25vacs8fB6bZYuP1pbzCm2TnkMC4OPXSsMjyQzkQG1+kenxHyvomO+303f RVXwoNM8mg++u5Kk38OlxexDj+sEtmplwLCNNuCD+puQQQ1ELwD1OVBI6XKzAKmxstv6 1dbiNdFycbjTyOs2mSqf6+7YC+lU3QkPJqmzDUO0xSt5QRECZPT8hocIiCRvXKiTpKQe h1tA== 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=NP6mJ29jUvRyhBhncNKlo7NL/jd/X11tLUHSKQAxHd0=; b=rR5AnchdQ3wX8EaP5IvMf9yagf6Y4fHA6+sShynFJjdpJkNrmuDOpBtlAhq1MTwKfi 079wXCn98nN8DN6OnW2V3T6eHv+QE1LaPSzXSxZQmKJHt2KPaawkjBsV09oEHmQwIf2M uh7ZTaQX3HPy1NV17jc4h86kX2b1O8Zipan3oPr/V0AbIAVcAKRMtd4U/k5Y6qNXRsLJ H/2ZStDcP8yYHRUWBaZzxxu2lJWchSqEaafqptaz5vgyUCiwU07oZQiUyaR5FG+BjFM/ hIfbSct6nnH80aC7o7RfA5O9KRd+br9gv8J0Z4BKvY9jYi3HMTfswCvDZDQ8WKgmCSfD a9qw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id d14si799985wrz.4.2022.02.09.05.54.22 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 09 Feb 2022 05:54:22 -0800 (PST) Received-SPF: pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Received: from localhost.localdomain (mm-169-26-214-37.mgts.dynamic.pppoe.byfly.by [37.214.26.169] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 219DsIEB024454 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 9 Feb 2022 14:54:21 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH 2/7] ubi: Remove isar-image-ubi Date: Wed, 9 Feb 2022 16:54:06 +0300 Message-Id: <20220209135411.1313521-3-amikan@ilbers.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220209135411.1313521-1-amikan@ilbers.de> References: <20220209135411.1313521-1-amikan@ilbers.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-TUID: GEtHd3bHZtAv Make Isar UBI image more generic to be able to build default isar-image-base with UBI-related image types. Use image types as override postfix to declare UBI-related parametes. Signed-off-by: Anton Mikanovich --- .../recipes-core/images/isar-image-base.bb | 11 +++++++++++ .../recipes-core/images/isar-image-ubi.bb | 19 ------------------- meta/classes/image.bbclass | 8 ++++++++ 3 files changed, 19 insertions(+), 19 deletions(-) delete mode 100644 meta-isar/recipes-core/images/isar-image-ubi.bb diff --git a/meta-isar/recipes-core/images/isar-image-base.bb b/meta-isar/recipes-core/images/isar-image-base.bb index b381d85..b1f22fa 100644 --- a/meta-isar/recipes-core/images/isar-image-base.bb +++ b/meta-isar/recipes-core/images/isar-image-base.bb @@ -11,3 +11,14 @@ LIC_FILES_CHKSUM = "file://${LAYERDIR_core}/licenses/COPYING.GPLv2;md5=751419260 PV = "1.0" inherit image + +SRC_URI_append_ubi-img = " file://ubinize.cfg.tmpl" +SRC_URI_append_fit-img = " file://fitimage.its.tmpl" +SRC_URI_append_ubi-ubifs-img = " file://ubinize.cfg.tmpl file://fitimage.its.tmpl" + +TEMPLATE_VARS_append_fit-img = " KERNEL_IMG INITRD_IMG DTB_IMG" +TEMPLATE_VARS_append_ubi-img = " KERNEL_IMG INITRD_IMG DTB_IMG UBIFS_IMG FIT_IMG" +TEMPLATE_VARS_append_ubi-ubifs-img = " KERNEL_IMG INITRD_IMG DTB_IMG UBIFS_IMG FIT_IMG" +TEMPLATE_FILES_append_fit-img = " fitimage.its.tmpl" +TEMPLATE_FILES_append_ubi-img = " ubinize.cfg.tmpl" +TEMPLATE_FILES_append_ubi-ubifs-img = " ubinize.cfg.tmpl fitimage.its.tmpl" diff --git a/meta-isar/recipes-core/images/isar-image-ubi.bb b/meta-isar/recipes-core/images/isar-image-ubi.bb deleted file mode 100644 index 9323822..0000000 --- a/meta-isar/recipes-core/images/isar-image-ubi.bb +++ /dev/null @@ -1,19 +0,0 @@ -# UBI image recipe -# -# This software is a part of ISAR. -# Copyright (C) Siemens AG, 2019 -# -# SPDX-License-Identifier: MIT - -DESCRIPTION = "UBI Isar image" - -LICENSE = "gpl-2.0" -LIC_FILES_CHKSUM = "file://${LAYERDIR_core}/licenses/COPYING.GPLv2;md5=751419260aa954499f7abaabaa882bbe" - -inherit image - -SRC_URI += "file://ubinize.cfg.tmpl \ - file://fitimage.its.tmpl" - -TEMPLATE_VARS = "KERNEL_IMG INITRD_IMG DTB_IMG UBIFS_IMG FIT_IMG" -TEMPLATE_FILES = "ubinize.cfg.tmpl fitimage.its.tmpl" diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 4b56e91..9ad04e8 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -238,3 +238,11 @@ addtask rootfs_finalize before do_rootfs after do_rootfs_postprocess # Last so that the image type can overwrite tasks if needed inherit ${IMAGE_FSTYPES} + +def get_fstypes_overrides(d): + res = '' + for type in (d.getVar('IMAGE_FSTYPES', True) or '').split(): + res += ':%s' % type + return res + +OVERRIDES_append = ":${@get_fstypes_overrides(d)}" -- 2.25.1