[PATCH 1/2] arm,arm-bsp/classes: Move wic_nopt to meta-arm

[PATCH 1/2] arm,arm-bsp/classes: Move wic_nopt to meta-arm

[Peter Hoyes]

From: Peter Hoyes <Peter.Hoyes@arm.com>

To support using the wic_nopt bbclass from BSP layers other than
meta-arm-bsp, move it to meta-arm.

Signed-off-by: Peter Hoyes <Peter.Hoyes@arm.com>
---
 {meta-arm-bsp => meta-arm}/classes/wic_nopt.bbclass | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename {meta-arm-bsp => meta-arm}/classes/wic_nopt.bbclass (100%)

diff --git a/meta-arm-bsp/classes/wic_nopt.bbclass b/meta-arm/classes/wic_nopt.bbclass
similarity index 100%
rename from meta-arm-bsp/classes/wic_nopt.bbclass
rename to meta-arm/classes/wic_nopt.bbclass
-- 
2.34.1

[PATCH 2/2] arm-bsp/classes: Use :append to add to IMAGE_TYPES in wic_nopt

[Peter Hoyes]

From: Peter Hoyes <Peter.Hoyes@arm.com>

IMAGE_TYPES += "wic.nopt" is effective if the bbclass is included
using IMAGE_CLASSES, but not if included directly (using inherit) due to
file parse ordering.

To support applying wic_nopt locally (i.e. for certain image recipes but
not others), change to use :append.

Signed-off-by: Peter Hoyes <Peter.Hoyes@arm.com>
---
 meta-arm/classes/wic_nopt.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-arm/classes/wic_nopt.bbclass b/meta-arm/classes/wic_nopt.bbclass
index 322be498..9c78fd77 100644
--- a/meta-arm/classes/wic_nopt.bbclass
+++ b/meta-arm/classes/wic_nopt.bbclass
@@ -1,7 +1,7 @@
 # This class removes the empty partition table header
 # in the WIC file when --no-table WKS option is used
 
-IMAGE_TYPES += "wic.nopt"
+IMAGE_TYPES:append = " wic.nopt"
 
 CONVERSIONTYPES += "nopt"
 
-- 
2.34.1

Re: [PATCH 1/2] arm,arm-bsp/classes: Move wic_nopt to meta-arm

[Jon Mason]

On Thu, 16 Feb 2023 15:33:39 +0000, Peter Hoyes wrote:
> To support using the wic_nopt bbclass from BSP layers other than
> meta-arm-bsp, move it to meta-arm.

Applied, thanks!

[1/2] arm,arm-bsp/classes: Move wic_nopt to meta-arm
      commit: 557e89242eafc19dbe394403619a5a45cbf95142
[2/2] arm-bsp/classes: Use :append to add to IMAGE_TYPES in wic_nopt
      commit: 7fee7ee6009c16479a169422cdb4c2f579a4550c

Best regards,
-- 
Jon Mason <jon.mason@arm.com>