class 'distro_features_check' has moved to 'features_check', which does not allow dunfell and latest releases to build against zeus release.
inherit class based on LAYERSERIES_CORENAMES Signed-off-by: Naveen Saini <[email protected]> --- conf/layer.conf | 4 +++- recipes-graphics/hdcp/hdcp_19.4.0.bb | 2 +- ...inux-yocto-rt_5.4.bbappend => linux-yocto-rt_5.%.bbappend} | 0 .../{linux-yocto_5.4.bbappend => linux-yocto_5.%.bbappend} | 0 recipes-multimedia/libva/intel-media-driver_20.1.1.bb | 2 +- recipes-multimedia/libva/intel-vaapi-driver_2.4.0.bb | 2 +- recipes-multimedia/libyami/libyami-utils_1.3.2.bb | 2 +- recipes-multimedia/libyami/libyami_1.3.2.bb | 2 +- recipes-multimedia/mediasdk/intel-mediasdk_20.1.0.bb | 2 +- 9 files changed, 9 insertions(+), 7 deletions(-) rename recipes-kernel/linux/{linux-yocto-rt_5.4.bbappend => linux-yocto-rt_5.%.bbappend} (100%) rename recipes-kernel/linux/{linux-yocto_5.4.bbappend => linux-yocto_5.%.bbappend} (100%) diff --git a/conf/layer.conf b/conf/layer.conf index 0460930c..eb55b70b 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -18,7 +18,7 @@ LAYERRECOMMENDS_intel = "dpdk intel-qat" # This should only be incremented on significant changes that will # cause compatibility issues with other layers LAYERVERSION_intel = "5" -LAYERSERIES_COMPAT_intel = "dunfell" +LAYERSERIES_COMPAT_intel = " zeus dunfell" BBFILES_DYNAMIC += " \ clang-layer:${LAYERDIR}/dynamic-layers/clang-layer/*/*/*.bb \ @@ -44,3 +44,5 @@ PREFERRED_PROVIDER_nativesdk-libva ?= "nativesdk-libva" PREFERRED_PROVIDER_libva-utils ?= "libva-utils" PREFERRED_PROVIDER_libva-native ?= "libva-utils-native" PREFERRED_PROVIDER_nativesdk-libva-utils ?= "nativesdk-libva-utils" + +COMPAT_DISTRO_FEATURE_CHECK = "${@bb.utils.contains('LAYERSERIES_CORENAMES', 'zeus', 'distro_features_check', 'features_check', d)}" diff --git a/recipes-graphics/hdcp/hdcp_19.4.0.bb b/recipes-graphics/hdcp/hdcp_19.4.0.bb index d4834f5e..77825184 100644 --- a/recipes-graphics/hdcp/hdcp_19.4.0.bb +++ b/recipes-graphics/hdcp/hdcp_19.4.0.bb @@ -7,7 +7,7 @@ LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE.md;md5=c50969be4feb8b99c6baa3795ede4dce" SECTION = "lib" -inherit pkgconfig cmake useradd systemd features_check +inherit pkgconfig cmake useradd systemd ${COMPAT_DISTRO_FEATURE_CHECK} SRC_URI = "git://github.com/intel/hdcp.git \ file://0001-main-fix-hdcpd-service-failure.patch \ diff --git a/recipes-kernel/linux/linux-yocto-rt_5.4.bbappend b/recipes-kernel/linux/linux-yocto-rt_5.%.bbappend similarity index 100% rename from recipes-kernel/linux/linux-yocto-rt_5.4.bbappend rename to recipes-kernel/linux/linux-yocto-rt_5.%.bbappend diff --git a/recipes-kernel/linux/linux-yocto_5.4.bbappend b/recipes-kernel/linux/linux-yocto_5.%.bbappend similarity index 100% rename from recipes-kernel/linux/linux-yocto_5.4.bbappend rename to recipes-kernel/linux/linux-yocto_5.%.bbappend diff --git a/recipes-multimedia/libva/intel-media-driver_20.1.1.bb b/recipes-multimedia/libva/intel-media-driver_20.1.1.bb index d30b6fc6..e1c08fab 100644 --- a/recipes-multimedia/libva/intel-media-driver_20.1.1.bb +++ b/recipes-multimedia/libva/intel-media-driver_20.1.1.bb @@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.md;md5=6aab5363823095ce682b155fef0231f0 \ # Only for 64 bit until this is resolved: https://github.com/intel/media-driver/issues/356 COMPATIBLE_HOST = '(x86_64).*-linux' -inherit features_check +inherit ${COMPAT_DISTRO_FEATURE_CHECK} REQUIRED_DISTRO_FEATURES = "opengl" DEPENDS += "libva gmmlib" diff --git a/recipes-multimedia/libva/intel-vaapi-driver_2.4.0.bb b/recipes-multimedia/libva/intel-vaapi-driver_2.4.0.bb index 8d373bc2..760aa24e 100644 --- a/recipes-multimedia/libva/intel-vaapi-driver_2.4.0.bb +++ b/recipes-multimedia/libva/intel-vaapi-driver_2.4.0.bb @@ -19,7 +19,7 @@ SRC_URI[sha256sum] = "71e2ddd985af6b221389db1018c4e8ca27a7f939fb51dcdf49d0efcb5f UPSTREAM_CHECK_URI = "https://github.com/intel/intel-vaapi-driver/releases"; -inherit meson pkgconfig features_check +inherit meson pkgconfig ${COMPAT_DISTRO_FEATURE_CHECK} REQUIRED_DISTRO_FEATURES = "opengl" diff --git a/recipes-multimedia/libyami/libyami-utils_1.3.2.bb b/recipes-multimedia/libyami/libyami-utils_1.3.2.bb index f9333f3d..e991df4b 100644 --- a/recipes-multimedia/libyami/libyami-utils_1.3.2.bb +++ b/recipes-multimedia/libyami/libyami-utils_1.3.2.bb @@ -15,7 +15,7 @@ S = "${WORKDIR}/git" DEPENDS = "libva libyami" -inherit autotools pkgconfig features_check +inherit autotools pkgconfig ${COMPAT_DISTRO_FEATURE_CHECK} REQUIRED_DISTRO_FEATURES = "opengl" diff --git a/recipes-multimedia/libyami/libyami_1.3.2.bb b/recipes-multimedia/libyami/libyami_1.3.2.bb index c8628141..ad8cb9a8 100644 --- a/recipes-multimedia/libyami/libyami_1.3.2.bb +++ b/recipes-multimedia/libyami/libyami_1.3.2.bb @@ -19,6 +19,6 @@ PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "x11", "x11", "", d)} PACKAGECONFIG[x11] = "--enable-x11,--disable-x11,virtual/libx11 libxrandr libxrender" DEPENDS = "libva" -inherit autotools pkgconfig features_check +inherit autotools pkgconfig ${COMPAT_DISTRO_FEATURE_CHECK} REQUIRED_DISTRO_FEATURES = "opengl" diff --git a/recipes-multimedia/mediasdk/intel-mediasdk_20.1.0.bb b/recipes-multimedia/mediasdk/intel-mediasdk_20.1.0.bb index 9bb1e3e1..be82d879 100644 --- a/recipes-multimedia/mediasdk/intel-mediasdk_20.1.0.bb +++ b/recipes-multimedia/mediasdk/intel-mediasdk_20.1.0.bb @@ -14,7 +14,7 @@ CVE_DETAILS = "intel:media_sdk" COMPATIBLE_HOST = '(x86_64).*-linux' COMPATIBLE_HOST_x86-x32 = "null" -inherit features_check +inherit ${COMPAT_DISTRO_FEATURE_CHECK} REQUIRED_DISTRO_FEATURES = "opengl" DEPENDS += "libdrm libva intel-media-driver" -- 2.17.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#6514): https://lists.yoctoproject.org/g/meta-intel/message/6514 Mute This Topic: https://lists.yoctoproject.org/mt/73235530/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-intel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
