diff options
Diffstat (limited to 'conf/layer.conf')
-rw-r--r-- | conf/layer.conf | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/conf/layer.conf b/conf/layer.conf index e8ddef85..97dfb897 100644 --- a/conf/layer.conf +++ b/conf/layer.conf | |||
@@ -10,15 +10,16 @@ BBFILE_PATTERN_intel := "^${LAYERDIR}/" | |||
10 | BBFILE_PRIORITY_intel = "5" | 10 | BBFILE_PRIORITY_intel = "5" |
11 | 11 | ||
12 | # Additional license directories. | 12 | # Additional license directories. |
13 | LICENSE_PATH += "${LAYERDIR}/custom-licenses" | 13 | CUSTOM_LICENSES_PATH = "${LAYERDIR}/custom-licenses" |
14 | LICENSE_PATH += "${CUSTOM_LICENSES_PATH}" | ||
14 | 15 | ||
15 | LAYERDEPENDS_intel = "core" | 16 | LAYERDEPENDS_intel = "core" |
16 | LAYERRECOMMENDS_intel = "dpdk intel-qat" | 17 | LAYERRECOMMENDS_intel = "dpdk" |
17 | 18 | ||
18 | # This should only be incremented on significant changes that will | 19 | # This should only be incremented on significant changes that will |
19 | # cause compatibility issues with other layers | 20 | # cause compatibility issues with other layers |
20 | LAYERVERSION_intel = "5" | 21 | LAYERVERSION_intel = "5" |
21 | LAYERSERIES_COMPAT_intel = " zeus dunfell" | 22 | LAYERSERIES_COMPAT_intel = "kirkstone scarthgap" |
22 | 23 | ||
23 | BBFILES_DYNAMIC += " \ | 24 | BBFILES_DYNAMIC += " \ |
24 | clang-layer:${LAYERDIR}/dynamic-layers/clang-layer/*/*/*.bb \ | 25 | clang-layer:${LAYERDIR}/dynamic-layers/clang-layer/*/*/*.bb \ |
@@ -31,8 +32,14 @@ BBFILES_DYNAMIC += " \ | |||
31 | 32 | ||
32 | require ${LAYERDIR}/conf/include/maintainers.inc | 33 | require ${LAYERDIR}/conf/include/maintainers.inc |
33 | 34 | ||
34 | PREFERRED_PROVIDER_zlib ?= "zlib" | 35 | # Use the libva from OE-Core when layer is included but no MACHINE |
35 | PREFERRED_PROVIDER_zlib-native ?= "zlib-native" | 36 | # from meta-intel is being used. |
36 | PREFERRED_PROVIDER_nativesdk-zlib ?= "nativesdk-zlib" | 37 | PREFERRED_PROVIDER_libva ?= "libva" |
38 | PREFERRED_PROVIDER_libva-native ?= "libva-native" | ||
39 | PREFERRED_PROVIDER_nativesdk-libva ?= "nativesdk-libva" | ||
37 | 40 | ||
38 | COMPAT_DISTRO_FEATURE_CHECK = "${@bb.utils.contains('LAYERSERIES_CORENAMES', 'zeus', 'distro_features_check', 'features_check', d)}" | 41 | PREFERRED_PROVIDER_libva-utils ?= "libva-utils" |
42 | PREFERRED_PROVIDER_libva-utils-native ?= "libva-utils-native" | ||
43 | PREFERRED_PROVIDER_nativesdk-libva-utils ?= "nativesdk-libva-utils" | ||
44 | |||
45 | # addpylib ${LAYERDIR}/lib oeqa | ||