From 36ba200fe2f26ddcd32f0b4520174e03a2ca11c7 Mon Sep 17 00:00:00 2001 From: Rasmus Villemoes Date: Fri, 19 Apr 2024 23:42:13 +0200 Subject: [PATCH 1/2] conf: layer: drop 'nanbield' from LAYERSERIES_COMPAT OE-core has renamed the bmap-tools forcing every downstream layer to update their metadata. Thus it is not possible to actually be compatible with both nanbield and scarthgap, so drop nanbield. Signed-off-by: Rasmus Villemoes --- conf/layer.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/layer.conf b/conf/layer.conf index 602ef98..718a102 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -11,4 +11,4 @@ BBFILE_PRIORITY_ptx = "6" LAYERDEPENDS_ptx = "core" -LAYERSERIES_COMPAT_ptx = "nanbield scarthgap" +LAYERSERIES_COMPAT_ptx = "scarthgap" From d503cd7bccff4b85f6e2769f319a225cdffb08e9 Mon Sep 17 00:00:00 2001 From: Rasmus Villemoes Date: Fri, 19 Apr 2024 23:44:08 +0200 Subject: [PATCH 2/2] genimage.bbclass: adapt to bmap-tools -> bmaptool renaming OE-core has renamed this recipe, and attempts to add a PROVIDES compatibility item have been rejected. https://lore.kernel.org/openembedded-core/CANx9H-B4-tEGjC_y0GiFrAeR24Z2PjocVX-=6CRbGBQ+rXytgg@mail.gmail.com/ Signed-off-by: Rasmus Villemoes --- classes-recipe/genimage.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes-recipe/genimage.bbclass b/classes-recipe/genimage.bbclass index ed423d2..2bbb491 100644 --- a/classes-recipe/genimage.bbclass +++ b/classes-recipe/genimage.bbclass @@ -101,7 +101,7 @@ do_genimage[vardeps] += "GENIMAGE_VARIABLES" do_genimage[depends] += "${@'${GENIMAGE_ROOTFS_IMAGE}:do_image_complete' if '${GENIMAGE_ROOTFS_IMAGE}' else ''}" GENIMAGE_CREATE_BMAP ?= "0" -do_genimage[depends] += "${@'bmap-tools-native:do_populate_sysroot' if d.getVar('GENIMAGE_CREATE_BMAP') == '1' else ''}" +do_genimage[depends] += "${@'bmaptool-native:do_populate_sysroot' if d.getVar('GENIMAGE_CREATE_BMAP') == '1' else ''}" GENIMAGE_TMPDIR = "${WORKDIR}/genimage-tmp" GENIMAGE_ROOTDIR = "${WORKDIR}/root"