diff --git a/coin/module_config.yaml b/coin/module_config.yaml index 0a7e6aa..84f95bb 100644 --- a/coin/module_config.yaml +++ b/coin/module_config.yaml @@ -128,6 +128,7 @@ instructions: DISTRO_CODENAME=$(sed -n -e "s/DISTRO_CODENAME.*\"\(.*\)\"/\1/p" ../poky/meta-*/conf/distro/poky.conf) export SSTATE_DIR=/mnt/yocto-cache/sstate-caches/${DISTRO_CODENAME}-meta-qt6 bitbake-layers add-layer ../meta-openembedded/meta-oe + bitbake-layers add-layer ../meta-openembedded/meta-python bitbake-layers add-layer ../meta-mingw bitbake-layers add-layer ${SOURCE_DIR} diff --git a/recipes-qt/qt6/qface_git.bb b/recipes-devtools/python/python3-qface_2.0.4.bb similarity index 58% rename from recipes-qt/qt6/qface_git.bb rename to recipes-devtools/python/python3-qface_2.0.4.bb index b0495cc..db1a3c8 100644 --- a/recipes-qt/qt6/qface_git.bb +++ b/recipes-devtools/python/python3-qface_2.0.4.bb @@ -1,10 +1,5 @@ inherit pypi setuptools3 -python() { - if 'meta-python' not in d.getVar('BBFILE_COLLECTIONS').split(): - raise bb.parse.SkipRecipe('Requires meta-python to be present.') -} - DEPS += " python3-jinja2 \ python3-click \ python3-pyyaml \ @@ -21,10 +16,6 @@ RDEPENDS:${PN} += "${DEPS}" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=eee61e10a40b0e3045ee5965bcd9a8b5" -SRC_URI = "git://code.qt.io/qt/qtinterfaceframework-qface.git;protocol=https;nobranch=1" -SRCREV = "6b7d4f9560f4ca6027ada9f0df25bf0262c71294" -PV = "2.0.4" -S = "${WORKDIR}/git" -CLEANBROKEN = "1" +SRC_URI[sha256sum] = "42b0a0d37ed77cf1a9994f5ed77e3a6138468241df1700667a9ab0b848d6ad57" BBCLASSEXTEND = "nativesdk native" diff --git a/recipes-qt/qt6/qtinterfaceframework_git.bb b/recipes-qt/qt6/qtinterfaceframework_git.bb index 97fce44..8303635 100644 --- a/recipes-qt/qt6/qtinterfaceframework_git.bb +++ b/recipes-qt/qt6/qtinterfaceframework_git.bb @@ -41,7 +41,7 @@ FILES:${PN}-refapi-vehiclefuntions = "\ DEPENDS += "qtbase qtinterfaceframework-native" -SRCREV = "2cbe1c72a6c48bf1ca6bb2fd739496f7f9a3e233" +SRCREV = "6263b4d5c399e2a850d3280aa6a54b6a739b4555" PACKAGECONFIG ?= "ifcodegen remoteobjects interfaceframework \ ${PACKAGECONFIG_REFERENCE_API} \ @@ -50,7 +50,7 @@ PACKAGECONFIG ?= "ifcodegen remoteobjects interfaceframework \ PACKAGECONFIG[taglib] = "-DFEATURE_taglib=ON,-DFEATURE_taglib=OFF,taglib" PACKAGECONFIG[host-tools-only] = "-DFEATURE_host_tools_only=ON,-DFEATURE_host_tools_only=OFF" -PACKAGECONFIG[ifcodegen] = "-DFEATURE_ifcodegen=ON,-DFEATURE_ifcodegen=OFF,qface,qface" +PACKAGECONFIG[ifcodegen] = "-DFEATURE_ifcodegen=ON,-DFEATURE_ifcodegen=OFF,python3-qface,python3-qface" PACKAGECONFIG[remoteobjects] = "-DFEATURE_remoteobjects=ON,-DFEATURE_remoteobjects=OFF,qtremoteobjects qtremoteobjects-native" #interfaceframework only