diff --git a/meta-digi-dey/classes/dey-image.bbclass b/meta-digi-dey/classes/dey-image.bbclass index 57ec678e0..bd537b35e 100644 --- a/meta-digi-dey/classes/dey-image.bbclass +++ b/meta-digi-dey/classes/dey-image.bbclass @@ -1,6 +1,7 @@ # DEY image features. # -# Copyright (C) 2012-2024 Digi International. +# Copyright (C) 2012-2024, Digi International Inc. +# # # Add build info to rootfs images (/etc/buildinfo) @@ -22,12 +23,6 @@ EXTRA_USERS_PARAMS += "\ usermod -p '${MD5_ROOT_PASSWD}' root; \ " -# -# Create QT5 capable toolchain/SDK if 'dey-qt' image feature is enabled -# -inherit qt-version -inherit ${@bb.utils.contains("IMAGE_FEATURES", "dey-qt", "${QT_POPULATE_SDK}", "",d)} - # # Generate ZIP installer if configured in the project's local.conf # diff --git a/meta-digi-dey/recipes-core/images/dey-image-qt.bb b/meta-digi-dey/recipes-core/images/dey-image-qt.bb index c3b3b6474..b82e8d0b7 100644 --- a/meta-digi-dey/recipes-core/images/dey-image-qt.bb +++ b/meta-digi-dey/recipes-core/images/dey-image-qt.bb @@ -1,8 +1,14 @@ # -# Copyright (C) 2016-2023, Digi International Inc. +# Copyright (C) 2016-2024, Digi International Inc. # require dey-image-graphical.inc +# +# Create QT5/6 capable toolchain/SDK +# +inherit qt-version +inherit ${QT_POPULATE_SDK} + DESCRIPTION = "DEY image with QT graphical libraries" GRAPHICAL_CORE = "qt"