diff options
author | Naveen Saini <naveen.kumar.saini@intel.com> | 2020-04-16 13:22:17 +0800 |
---|---|---|
committer | Anuj Mittal <anuj.mittal@intel.com> | 2020-04-16 13:40:46 +0800 |
commit | ee6810244211e6226cde0d2433e79461ae89b750 (patch) | |
tree | 63f1cf0576c738c1cc04561320f492a14faf2f91 /conf | |
parent | 67f781be8924983e9d1230974c8d722ee63d0153 (diff) | |
download | meta-intel-ee6810244211e6226cde0d2433e79461ae89b750.tar.gz |
libva-utils-intel: keep upgraded libva-utils version to meta-intel MACHINE specific
Make sure that we use the upgraded version of libva-utils
only when using MACHINE value from meta-intel.
For all other cases, libva-utils from oe-core should be used.
Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Diffstat (limited to 'conf')
-rw-r--r-- | conf/layer.conf | 4 | ||||
-rw-r--r-- | conf/machine/include/meta-intel.inc | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/conf/layer.conf b/conf/layer.conf index 99b6b211..0460930c 100644 --- a/conf/layer.conf +++ b/conf/layer.conf | |||
@@ -40,3 +40,7 @@ PREFERRED_PROVIDER_nativesdk-zlib ?= "nativesdk-zlib" | |||
40 | PREFERRED_PROVIDER_libva ?= "libva" | 40 | PREFERRED_PROVIDER_libva ?= "libva" |
41 | PREFERRED_PROVIDER_libva-native ?= "libva-native" | 41 | PREFERRED_PROVIDER_libva-native ?= "libva-native" |
42 | PREFERRED_PROVIDER_nativesdk-libva ?= "nativesdk-libva" | 42 | PREFERRED_PROVIDER_nativesdk-libva ?= "nativesdk-libva" |
43 | |||
44 | PREFERRED_PROVIDER_libva-utils ?= "libva-utils" | ||
45 | PREFERRED_PROVIDER_libva-native ?= "libva-utils-native" | ||
46 | PREFERRED_PROVIDER_nativesdk-libva-utils ?= "nativesdk-libva-utils" | ||
diff --git a/conf/machine/include/meta-intel.inc b/conf/machine/include/meta-intel.inc index 6b26125b..47976cde 100644 --- a/conf/machine/include/meta-intel.inc +++ b/conf/machine/include/meta-intel.inc | |||
@@ -16,6 +16,10 @@ PREFERRED_PROVIDER_libva = "libva-intel" | |||
16 | PREFERRED_PROVIDER_libva-native = "libva-intel-native" | 16 | PREFERRED_PROVIDER_libva-native = "libva-intel-native" |
17 | PREFERRED_PROVIDER_nativesdk-libva = "nativesdk-libva-intel" | 17 | PREFERRED_PROVIDER_nativesdk-libva = "nativesdk-libva-intel" |
18 | 18 | ||
19 | PREFERRED_PROVIDER_libva-utils = "libva-utils-intel" | ||
20 | PREFERRED_PROVIDER_libva-native = "libva-utils-intel-native" | ||
21 | PREFERRED_PROVIDER_nativesdk-libva-utils = "nativesdk-libva-utils-intel" | ||
22 | |||
19 | PREFERRED_VERSION_linux-intel ?= "5.4%" | 23 | PREFERRED_VERSION_linux-intel ?= "5.4%" |
20 | PREFERRED_VERSION_linux-intel-rt ?= "5.4%" | 24 | PREFERRED_VERSION_linux-intel-rt ?= "5.4%" |
21 | PREFERRED_VERSION_linux-intel_poky-altcfg ?= "4.19%" | 25 | PREFERRED_VERSION_linux-intel_poky-altcfg ?= "4.19%" |