From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7062708050763710464 X-Received: by 2002:a5d:6892:: with SMTP id h18mr2229670wru.640.1644414863888; Wed, 09 Feb 2022 05:54:23 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:8bda:: with SMTP id w26ls103775wra.1.gmail; Wed, 09 Feb 2022 05:54:23 -0800 (PST) X-Google-Smtp-Source: ABdhPJxP2cXHVzLzpz1KAc7NzXO3icui1d+k2GiuWzWTXHMHuWsgnuUtbHv3jx+pjs7AGDGrm+HZ X-Received: by 2002:a5d:4dd0:: with SMTP id f16mr2198206wru.39.1644414863177; Wed, 09 Feb 2022 05:54:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644414863; cv=none; d=google.com; s=arc-20160816; b=Xs+v/ECSSnEwbD9kgD+vx1X2ljOdn6jIihsc9sRcVv78eexyE8Kx3hhTLBdny+Tjah /K6NltanOGUwoTOTGJQl5JICGjt1KEVNLnVzrc09cIfwqumOaiBk0p6qHUGfldv9RdQ3 bfp9d+WY44uWGAv2H/9ibukKJwSCk5tNEduCkI/LHUUPK1gb7+XZ56QyxoxO57D/nhWm ITVcvHxxih9bipMWshTsysCTUYz43XHgGQCkGPksgypls23zgqQnVEywz/ZMwtaDIz9s w7OFcr+9V07wAnVBx33ddvVVzNjeH2vuyEmdvUpq0i8dlX7a55o2NOmuQXW5+iS6X4WO TTUQ== 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=ujeeURNoPJaTMAReua+k9K8pYCha6G69QxwHPTfCMdk=; b=OxIn2yAkZiAQu3PiOXDIpbu0MvQzwXs+PYpGbqXAOiDzGjT07Fn3HqigRCkNox7Meh CNYq7gWr6MWfy21P5nmTxRg4XtCbC49VaMpZJmOWaXdfnyPt+oIKIgIRlZho3m8ctlF9 qLXT4x5K/E1JacHuZZxYBMFolDuLrpPH4MynYh0ECqASI1tUQtqtCE+f88StTorG/Mc8 DxlwdstKSDZzKK9xCUMueX9+Y0dnxRM3VbSpWEX7zulq6n6tG0ixO51kElHGSh2XI1+y 81trd/TC+I3/q9szBvXCszjxckGtO72CoTgyVsJSuPsEm7bxj8tks+2RLdTNon9ps24K Ictg== 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 e5si881144wrj.8.2022.02.09.05.54.23 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 09 Feb 2022 05:54:23 -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 219DsIEC024454 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 9 Feb 2022 14:54:22 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH 3/7] ubi: Move tasks reorder into parent task Date: Wed, 9 Feb 2022 16:54:07 +0300 Message-Id: <20220209135411.1313521-4-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: HTEwWGsdJ6SD Image type ubi-ubifs-img was created to implement UBI image generation with FIT and UBIFS subimages included. Now we can implement the same with multiple image types. This will also allow to use UBIFS+UBI setup without creating another image type. The only issue should be resolved then is calling task in correct order. Move dependencies logic into parent UBI image type bbclass to set task dependencies correctly. Signed-off-by: Anton Mikanovich --- meta-isar/classes/ubi-ubifs-img.bbclass | 4 ++-- meta/classes/ubi-img.bbclass | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/meta-isar/classes/ubi-ubifs-img.bbclass b/meta-isar/classes/ubi-ubifs-img.bbclass index 095719a..cee29ef 100644 --- a/meta-isar/classes/ubi-ubifs-img.bbclass +++ b/meta-isar/classes/ubi-ubifs-img.bbclass @@ -5,6 +5,6 @@ # # SPDX-License-Identifier: MIT +# Deprecated: use IMAGE_FSTYPES = "ubi-img ubifs-img fit-img" instead + inherit ubi-img ubifs-img fit-img -addtask do_ubi_image after do_ubifs_image -addtask do_ubi_image after do_fit_image diff --git a/meta/classes/ubi-img.bbclass b/meta/classes/ubi-img.bbclass index efaf058..b6c2ff2 100644 --- a/meta/classes/ubi-img.bbclass +++ b/meta/classes/ubi-img.bbclass @@ -6,6 +6,12 @@ python() { if not d.getVar("UBINIZE_ARGS"): raise bb.parse.SkipRecipe("UBINIZE_ARGS must be set") + + fstypes = d.getVar('IMAGE_FSTYPES', True) or '' + if 'fit-img' in fstypes.split() or 'ubi-ubifs-img' in fstypes.split(): + bb.build.addtask('do_ubi_image', '', 'do_fit_image', d) + if 'ubifs-img' in fstypes.split() or 'ubi-ubifs-img' in fstypes.split(): + bb.build.addtask('do_ubi_image', '', 'do_ubifs_image', d) } UBINIZE_CFG ??= "ubinize.cfg" -- 2.25.1