From 2de532e1dca747b1be71c6b78dd8f47b5e19b910 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 19 Jan 2024 14:06:03 +0100 Subject: [PATCH] meta-luneos: BBMASK nativesdk-packagegroup-qt6-toolchain-host* because of inherit_defer * nativesdk-packagegroup-qt6-toolchain-host.bb inherits nativesdk, but after: https://git.openembedded.org/openembedded-core/diff/meta/classes-recipe/packagegroup.bbclass?id=451363438d38bd4552d5bcec4a92332f5819a5d4 it's no longer the last inherit, because allarch from packagegroup is inherit_defer causing: ERROR: /OE/build/luneos-scarthgap/meta-qt6/recipes-qt/packagegroups/nativesdk-packagegroup-qt6-toolchain-host.bb: QA Issue: nativesdk-packagegroup-qt6-toolchain-host: native/nativesdk class is not inherited last, this can result in unexpected behaviour. Classes inherited after native/nativesdk: allarch.bbclass [native-last] ERROR: /OE/build/luneos-scarthgap/meta-qt6/recipes-qt/packagegroups/nativesdk-packagegroup-qt6-toolchain-host.bb: Fatal QA errors were found, failing task. we don't use nativesdk so we can just BBMASK it here, until TQC figures out how to support multiple OE releases from the same branch as e.g.: https://code.qt.io/cgit/yocto/meta-qt6.git/tree/conf/layer.conf has: LAYERSERIES_COMPAT_qt6-layer = "kirkstone langdale mickledore nanbield" but doesn't even parse with scarthgap now and fixing it with inherit_defer for nativesdk won't be compatible with nanbield and older as it was only added in: https://git.openembedded.org/bitbake/commit/?id=5c2e840eafeba1f0f754c226b87bfb674f7bea29 Signed-off-by: Martin Jansa --- meta-luneos/conf/layer.conf | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/meta-luneos/conf/layer.conf b/meta-luneos/conf/layer.conf index 874576f0f4..849d1c5b36 100644 --- a/meta-luneos/conf/layer.conf +++ b/meta-luneos/conf/layer.conf @@ -32,3 +32,11 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ " LICENSE_PATH += "${LAYERDIR}/licenses" + +# Needs to use inherit_defer after: +# https://git.openembedded.org/openembedded-core/diff/meta/classes-recipe/packagegroup.bbclass?id=451363438d38bd4552d5bcec4a92332f5819a5d4 +# or else nativesdk is inherritted after deferred allarch from packagegroup causing: +# ERROR: /OE/build/luneos-scarthgap/meta-qt6/recipes-qt/packagegroups/nativesdk-packagegroup-qt6-toolchain-host.bb: QA Issue: nativesdk-packagegroup-qt6-toolchain-host: native/nativesdk class is not inherited last, this can result in unexpected behaviour. Classes inherited after native/nativesdk: allarch.bbclass [native-last] +# ERROR: /OE/build/luneos-scarthgap/meta-qt6/recipes-qt/packagegroups/nativesdk-packagegroup-qt6-toolchain-host.bb: Fatal QA errors were found, failing task. +BBMASK += "meta-qt6/recipes-qt/packagegroups/nativesdk-packagegroup-qt6-toolchain-host.bb" +BBMASK += "meta-qt6/recipes-qt/packagegroups/nativesdk-packagegroup-qt6-toolchain-host-commercial.bb"