From 085ba92a5930e841362b2294f7b6869e21697cd5 Mon Sep 17 00:00:00 2001 From: Naveen Saini Date: Tue, 21 Jul 2020 16:55:24 +0800 Subject: layer.conf: drop zeus compatibility Signed-off-by: Naveen Saini Signed-off-by: Anuj Mittal --- conf/layer.conf | 4 +--- recipes-graphics/hdcp/hdcp_20.1.0.bb | 2 +- recipes-multimedia/libva/intel-media-driver_20.2.0.bb | 2 +- recipes-multimedia/libva/intel-vaapi-driver_2.4.1.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.2.0.bb | 2 +- 7 files changed, 7 insertions(+), 9 deletions(-) diff --git a/conf/layer.conf b/conf/layer.conf index e8ddef85..fcfdf2a7 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 = " zeus dunfell" +LAYERSERIES_COMPAT_intel = "dunfell" BBFILES_DYNAMIC += " \ clang-layer:${LAYERDIR}/dynamic-layers/clang-layer/*/*/*.bb \ @@ -34,5 +34,3 @@ require ${LAYERDIR}/conf/include/maintainers.inc PREFERRED_PROVIDER_zlib ?= "zlib" PREFERRED_PROVIDER_zlib-native ?= "zlib-native" PREFERRED_PROVIDER_nativesdk-zlib ?= "nativesdk-zlib" - -COMPAT_DISTRO_FEATURE_CHECK = "${@bb.utils.contains('LAYERSERIES_CORENAMES', 'zeus', 'distro_features_check', 'features_check', d)}" diff --git a/recipes-graphics/hdcp/hdcp_20.1.0.bb b/recipes-graphics/hdcp/hdcp_20.1.0.bb index ed40b007..016e8e0a 100644 --- a/recipes-graphics/hdcp/hdcp_20.1.0.bb +++ b/recipes-graphics/hdcp/hdcp_20.1.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 ${COMPAT_DISTRO_FEATURE_CHECK} +inherit pkgconfig cmake useradd systemd features_check SRC_URI = "git://github.com/intel/hdcp.git \ file://0001-main-fix-hdcpd-service-failure.patch \ diff --git a/recipes-multimedia/libva/intel-media-driver_20.2.0.bb b/recipes-multimedia/libva/intel-media-driver_20.2.0.bb index 00380685..1cf21e44 100644 --- a/recipes-multimedia/libva/intel-media-driver_20.2.0.bb +++ b/recipes-multimedia/libva/intel-media-driver_20.2.0.bb @@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.md;md5=6aab5363823095ce682b155fef0231f0 \ COMPATIBLE_HOST = '(i.86|x86_64).*-linux' -inherit ${COMPAT_DISTRO_FEATURE_CHECK} +inherit features_check REQUIRED_DISTRO_FEATURES = "opengl" DEPENDS += "libva gmmlib" diff --git a/recipes-multimedia/libva/intel-vaapi-driver_2.4.1.bb b/recipes-multimedia/libva/intel-vaapi-driver_2.4.1.bb index 2112af2c..ccb9fec1 100644 --- a/recipes-multimedia/libva/intel-vaapi-driver_2.4.1.bb +++ b/recipes-multimedia/libva/intel-vaapi-driver_2.4.1.bb @@ -20,7 +20,7 @@ SRC_URI[sha256sum] = "0081fce08eb3a83f7d99c3b853c8fdfa0af437b8f5b0fb7c66faeb83bc UPSTREAM_CHECK_URI = "https://github.com/intel/intel-vaapi-driver/releases" -inherit meson pkgconfig ${COMPAT_DISTRO_FEATURE_CHECK} +inherit meson pkgconfig features_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 e991df4b..f9333f3d 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 ${COMPAT_DISTRO_FEATURE_CHECK} +inherit autotools pkgconfig features_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 ad8cb9a8..c8628141 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 ${COMPAT_DISTRO_FEATURE_CHECK} +inherit autotools pkgconfig features_check REQUIRED_DISTRO_FEATURES = "opengl" diff --git a/recipes-multimedia/mediasdk/intel-mediasdk_20.2.0.bb b/recipes-multimedia/mediasdk/intel-mediasdk_20.2.0.bb index 8ab4080b..4e264cb4 100644 --- a/recipes-multimedia/mediasdk/intel-mediasdk_20.2.0.bb +++ b/recipes-multimedia/mediasdk/intel-mediasdk_20.2.0.bb @@ -14,7 +14,7 @@ CVE_DETAILS = "intel:media_sdk" COMPATIBLE_HOST = '(x86_64).*-linux' COMPATIBLE_HOST_x86-x32 = "null" -inherit ${COMPAT_DISTRO_FEATURE_CHECK} +inherit features_check REQUIRED_DISTRO_FEATURES = "opengl" DEPENDS += "libdrm libva intel-media-driver" -- cgit v1.2.3-54-g00ecf