summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNaveen Saini <naveen.kumar.saini@intel.com>2020-04-24 05:38:37 (GMT)
committerAnuj Mittal <anuj.mittal@intel.com>2020-04-27 08:26:43 (GMT)
commit3f99053c646f02ccd9a005f489bde89c41b88b95 (patch)
treed27003e01161f8237441a669d504bbc19b308425
parentb7c987b5fc872ea49828c6f7941e631d172286a3 (diff)
downloadmeta-intel-3f99053c646f02ccd9a005f489bde89c41b88b95.tar.gz
layer.conf: allow to build with zeus
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 <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_19.4.0.bb2
-rw-r--r--recipes-kernel/linux/linux-yocto-rt_5.%.bbappend (renamed from recipes-kernel/linux/linux-yocto_5.4.bbappend)0
-rw-r--r--recipes-kernel/linux/linux-yocto_5.%.bbappend (renamed from recipes-kernel/linux/linux-yocto-rt_5.4.bbappend)0
-rw-r--r--recipes-multimedia/libva/intel-media-driver_20.1.1.bb2
-rw-r--r--recipes-multimedia/libva/intel-vaapi-driver_2.4.0.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.1.0.bb2
9 files changed, 9 insertions, 7 deletions
diff --git a/conf/layer.conf b/conf/layer.conf
index 0460930..eb55b70 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 = "dunfell" 21LAYERSERIES_COMPAT_intel = " zeus 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 \
@@ -44,3 +44,5 @@ PREFERRED_PROVIDER_nativesdk-libva ?= "nativesdk-libva"
44PREFERRED_PROVIDER_libva-utils ?= "libva-utils" 44PREFERRED_PROVIDER_libva-utils ?= "libva-utils"
45PREFERRED_PROVIDER_libva-native ?= "libva-utils-native" 45PREFERRED_PROVIDER_libva-native ?= "libva-utils-native"
46PREFERRED_PROVIDER_nativesdk-libva-utils ?= "nativesdk-libva-utils" 46PREFERRED_PROVIDER_nativesdk-libva-utils ?= "nativesdk-libva-utils"
47
48COMPAT_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 d4834f5..7782518 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"
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 features_check 10inherit pkgconfig cmake useradd systemd ${COMPAT_DISTRO_FEATURE_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-kernel/linux/linux-yocto_5.4.bbappend b/recipes-kernel/linux/linux-yocto-rt_5.%.bbappend
index daa7dd6..daa7dd6 100644
--- a/recipes-kernel/linux/linux-yocto_5.4.bbappend
+++ b/recipes-kernel/linux/linux-yocto-rt_5.%.bbappend
diff --git a/recipes-kernel/linux/linux-yocto-rt_5.4.bbappend b/recipes-kernel/linux/linux-yocto_5.%.bbappend
index daa7dd6..daa7dd6 100644
--- a/recipes-kernel/linux/linux-yocto-rt_5.4.bbappend
+++ b/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 d30b6fc..e1c08fa 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 \
14# Only for 64 bit until this is resolved: https://github.com/intel/media-driver/issues/356 14# Only for 64 bit until this is resolved: https://github.com/intel/media-driver/issues/356
15COMPATIBLE_HOST = '(x86_64).*-linux' 15COMPATIBLE_HOST = '(x86_64).*-linux'
16 16
17inherit features_check 17inherit ${COMPAT_DISTRO_FEATURE_CHECK}
18REQUIRED_DISTRO_FEATURES = "opengl" 18REQUIRED_DISTRO_FEATURES = "opengl"
19 19
20DEPENDS += "libva gmmlib" 20DEPENDS += "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 8d373bc..760aa24 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
19 19
20UPSTREAM_CHECK_URI = "https://github.com/intel/intel-vaapi-driver/releases" 20UPSTREAM_CHECK_URI = "https://github.com/intel/intel-vaapi-driver/releases"
21 21
22inherit meson pkgconfig features_check 22inherit meson pkgconfig ${COMPAT_DISTRO_FEATURE_CHECK}
23 23
24REQUIRED_DISTRO_FEATURES = "opengl" 24REQUIRED_DISTRO_FEATURES = "opengl"
25 25
diff --git a/recipes-multimedia/libyami/libyami-utils_1.3.2.bb b/recipes-multimedia/libyami/libyami-utils_1.3.2.bb
index f9333f3..e991df4 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 features_check 18inherit autotools pkgconfig ${COMPAT_DISTRO_FEATURE_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 c862814..ad8cb9a 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 features_check 22inherit autotools pkgconfig ${COMPAT_DISTRO_FEATURE_CHECK}
23 23
24REQUIRED_DISTRO_FEATURES = "opengl" 24REQUIRED_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 9bb1e3e..be82d87 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"
14COMPATIBLE_HOST = '(x86_64).*-linux' 14COMPATIBLE_HOST = '(x86_64).*-linux'
15COMPATIBLE_HOST_x86-x32 = "null" 15COMPATIBLE_HOST_x86-x32 = "null"
16 16
17inherit features_check 17inherit ${COMPAT_DISTRO_FEATURE_CHECK}
18REQUIRED_DISTRO_FEATURES = "opengl" 18REQUIRED_DISTRO_FEATURES = "opengl"
19 19
20DEPENDS += "libdrm libva intel-media-driver" 20DEPENDS += "libdrm libva intel-media-driver"