summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNaveen Saini <naveen.kumar.saini@intel.com>2020-07-21 08:55:24 (GMT)
committerAnuj Mittal <anuj.mittal@intel.com>2020-07-22 04:32:46 (GMT)
commit085ba92a5930e841362b2294f7b6869e21697cd5 (patch)
treeda2a4510b072312b5bf3f77df3c7432603e420e9
parentc5d1181064944aee3c736ab050de63a12df07608 (diff)
downloadmeta-intel-085ba92a5930e841362b2294f7b6869e21697cd5.tar.gz
layer.conf: drop zeus compatibility
Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com> Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
-rw-r--r--conf/layer.conf4
-rw-r--r--recipes-graphics/hdcp/hdcp_20.1.0.bb2
-rw-r--r--recipes-multimedia/libva/intel-media-driver_20.2.0.bb2
-rw-r--r--recipes-multimedia/libva/intel-vaapi-driver_2.4.1.bb2
-rw-r--r--recipes-multimedia/libyami/libyami-utils_1.3.2.bb2
-rw-r--r--recipes-multimedia/libyami/libyami_1.3.2.bb2
-rw-r--r--recipes-multimedia/mediasdk/intel-mediasdk_20.2.0.bb2
7 files changed, 7 insertions, 9 deletions
diff --git a/conf/layer.conf b/conf/layer.conf
index e8ddef8..fcfdf2a 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -18,7 +18,7 @@ LAYERRECOMMENDS_intel = "dpdk intel-qat"
18# This should only be incremented on significant changes that will 18# This should only be incremented on significant changes that will
19# cause compatibility issues with other layers 19# cause compatibility issues with other layers
20LAYERVERSION_intel = "5" 20LAYERVERSION_intel = "5"
21LAYERSERIES_COMPAT_intel = " zeus dunfell" 21LAYERSERIES_COMPAT_intel = "dunfell"
22 22
23BBFILES_DYNAMIC += " \ 23BBFILES_DYNAMIC += " \
24 clang-layer:${LAYERDIR}/dynamic-layers/clang-layer/*/*/*.bb \ 24 clang-layer:${LAYERDIR}/dynamic-layers/clang-layer/*/*/*.bb \
@@ -34,5 +34,3 @@ require ${LAYERDIR}/conf/include/maintainers.inc
34PREFERRED_PROVIDER_zlib ?= "zlib" 34PREFERRED_PROVIDER_zlib ?= "zlib"
35PREFERRED_PROVIDER_zlib-native ?= "zlib-native" 35PREFERRED_PROVIDER_zlib-native ?= "zlib-native"
36PREFERRED_PROVIDER_nativesdk-zlib ?= "nativesdk-zlib" 36PREFERRED_PROVIDER_nativesdk-zlib ?= "nativesdk-zlib"
37
38COMPAT_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 ed40b00..016e8e0 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"
7LIC_FILES_CHKSUM = "file://LICENSE.md;md5=c50969be4feb8b99c6baa3795ede4dce" 7LIC_FILES_CHKSUM = "file://LICENSE.md;md5=c50969be4feb8b99c6baa3795ede4dce"
8SECTION = "lib" 8SECTION = "lib"
9 9
10inherit pkgconfig cmake useradd systemd ${COMPAT_DISTRO_FEATURE_CHECK} 10inherit pkgconfig cmake useradd systemd features_check
11 11
12SRC_URI = "git://github.com/intel/hdcp.git \ 12SRC_URI = "git://github.com/intel/hdcp.git \
13 file://0001-main-fix-hdcpd-service-failure.patch \ 13 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 0038068..1cf21e4 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 \
13 13
14COMPATIBLE_HOST = '(i.86|x86_64).*-linux' 14COMPATIBLE_HOST = '(i.86|x86_64).*-linux'
15 15
16inherit ${COMPAT_DISTRO_FEATURE_CHECK} 16inherit features_check
17REQUIRED_DISTRO_FEATURES = "opengl" 17REQUIRED_DISTRO_FEATURES = "opengl"
18 18
19DEPENDS += "libva gmmlib" 19DEPENDS += "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 2112af2..ccb9fec 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
20 20
21UPSTREAM_CHECK_URI = "https://github.com/intel/intel-vaapi-driver/releases" 21UPSTREAM_CHECK_URI = "https://github.com/intel/intel-vaapi-driver/releases"
22 22
23inherit meson pkgconfig ${COMPAT_DISTRO_FEATURE_CHECK} 23inherit meson pkgconfig features_check
24 24
25REQUIRED_DISTRO_FEATURES = "opengl" 25REQUIRED_DISTRO_FEATURES = "opengl"
26 26
diff --git a/recipes-multimedia/libyami/libyami-utils_1.3.2.bb b/recipes-multimedia/libyami/libyami-utils_1.3.2.bb
index e991df4..f9333f3 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"
15 15
16DEPENDS = "libva libyami" 16DEPENDS = "libva libyami"
17 17
18inherit autotools pkgconfig ${COMPAT_DISTRO_FEATURE_CHECK} 18inherit autotools pkgconfig features_check
19 19
20REQUIRED_DISTRO_FEATURES = "opengl" 20REQUIRED_DISTRO_FEATURES = "opengl"
21 21
diff --git a/recipes-multimedia/libyami/libyami_1.3.2.bb b/recipes-multimedia/libyami/libyami_1.3.2.bb
index ad8cb9a..c862814 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)}
19PACKAGECONFIG[x11] = "--enable-x11,--disable-x11,virtual/libx11 libxrandr libxrender" 19PACKAGECONFIG[x11] = "--enable-x11,--disable-x11,virtual/libx11 libxrandr libxrender"
20 20
21DEPENDS = "libva" 21DEPENDS = "libva"
22inherit autotools pkgconfig ${COMPAT_DISTRO_FEATURE_CHECK} 22inherit autotools pkgconfig features_check
23 23
24REQUIRED_DISTRO_FEATURES = "opengl" 24REQUIRED_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 8ab4080..4e264cb 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"
14COMPATIBLE_HOST = '(x86_64).*-linux' 14COMPATIBLE_HOST = '(x86_64).*-linux'
15COMPATIBLE_HOST_x86-x32 = "null" 15COMPATIBLE_HOST_x86-x32 = "null"
16 16
17inherit ${COMPAT_DISTRO_FEATURE_CHECK} 17inherit features_check
18REQUIRED_DISTRO_FEATURES = "opengl" 18REQUIRED_DISTRO_FEATURES = "opengl"
19 19
20DEPENDS += "libdrm libva intel-media-driver" 20DEPENDS += "libdrm libva intel-media-driver"