diff options
Diffstat (limited to 'conf/layer.conf')
-rw-r--r-- | conf/layer.conf | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/conf/layer.conf b/conf/layer.conf index 54e98c03..97dfb897 100644 --- a/conf/layer.conf +++ b/conf/layer.conf | |||
@@ -19,7 +19,7 @@ LAYERRECOMMENDS_intel = "dpdk" | |||
19 | # This should only be incremented on significant changes that will | 19 | # This should only be incremented on significant changes that will |
20 | # cause compatibility issues with other layers | 20 | # cause compatibility issues with other layers |
21 | LAYERVERSION_intel = "5" | 21 | LAYERVERSION_intel = "5" |
22 | LAYERSERIES_COMPAT_intel = "dunfell hardknott honister" | 22 | LAYERSERIES_COMPAT_intel = "kirkstone scarthgap" |
23 | 23 | ||
24 | BBFILES_DYNAMIC += " \ | 24 | BBFILES_DYNAMIC += " \ |
25 | clang-layer:${LAYERDIR}/dynamic-layers/clang-layer/*/*/*.bb \ | 25 | clang-layer:${LAYERDIR}/dynamic-layers/clang-layer/*/*/*.bb \ |
@@ -32,10 +32,6 @@ BBFILES_DYNAMIC += " \ | |||
32 | 32 | ||
33 | require ${LAYERDIR}/conf/include/maintainers.inc | 33 | require ${LAYERDIR}/conf/include/maintainers.inc |
34 | 34 | ||
35 | PREFERRED_PROVIDER_zlib ?= "zlib" | ||
36 | PREFERRED_PROVIDER_zlib-native ?= "zlib-native" | ||
37 | PREFERRED_PROVIDER_nativesdk-zlib ?= "nativesdk-zlib" | ||
38 | |||
39 | # Use the libva from OE-Core when layer is included but no MACHINE | 35 | # Use the libva from OE-Core when layer is included but no MACHINE |
40 | # from meta-intel is being used. | 36 | # from meta-intel is being used. |
41 | PREFERRED_PROVIDER_libva ?= "libva" | 37 | PREFERRED_PROVIDER_libva ?= "libva" |
@@ -46,4 +42,4 @@ PREFERRED_PROVIDER_libva-utils ?= "libva-utils" | |||
46 | PREFERRED_PROVIDER_libva-utils-native ?= "libva-utils-native" | 42 | PREFERRED_PROVIDER_libva-utils-native ?= "libva-utils-native" |
47 | PREFERRED_PROVIDER_nativesdk-libva-utils ?= "nativesdk-libva-utils" | 43 | PREFERRED_PROVIDER_nativesdk-libva-utils ?= "nativesdk-libva-utils" |
48 | 44 | ||
49 | X86_TUNE_DIR = "${@bb.utils.contains('LAYERSERIES_CORENAMES', 'honister', 'include/x86', 'include', d)}" | 45 | # addpylib ${LAYERDIR}/lib oeqa |