diff options
Diffstat (limited to 'conf')
-rw-r--r-- | conf/layer.conf | 2 | ||||
-rw-r--r-- | conf/machine/include/meta-intel.inc | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/conf/layer.conf b/conf/layer.conf index b48cf611..eb8ab7f1 100644 --- a/conf/layer.conf +++ b/conf/layer.conf | |||
@@ -18,7 +18,7 @@ LAYERRECOMMENDS_intel = "dpdk" | |||
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 |
20 | LAYERVERSION_intel = "5" | 20 | LAYERVERSION_intel = "5" |
21 | LAYERSERIES_COMPAT_intel = "dunfell gatesgarth hardknott honister" | 21 | LAYERSERIES_COMPAT_intel = "dunfell hardknott honister" |
22 | 22 | ||
23 | BBFILES_DYNAMIC += " \ | 23 | BBFILES_DYNAMIC += " \ |
24 | clang-layer:${LAYERDIR}/dynamic-layers/clang-layer/*/*/*.bb \ | 24 | clang-layer:${LAYERDIR}/dynamic-layers/clang-layer/*/*/*.bb \ |
diff --git a/conf/machine/include/meta-intel.inc b/conf/machine/include/meta-intel.inc index f4d4c619..7ae78267 100644 --- a/conf/machine/include/meta-intel.inc +++ b/conf/machine/include/meta-intel.inc | |||
@@ -27,11 +27,9 @@ PREFERRED_PROVIDER_libva-utils-native = "libva-intel-utils-native" | |||
27 | PREFERRED_PROVIDER_nativesdk-libva-utils = "nativesdk-libva-intel-utils" | 27 | PREFERRED_PROVIDER_nativesdk-libva-utils = "nativesdk-libva-intel-utils" |
28 | 28 | ||
29 | PREFERRED_VERSION_opencl-clang ?= "${@bb.utils.contains('LLVMVERSION', '10.0.1', '10.0.0', \ | 29 | PREFERRED_VERSION_opencl-clang ?= "${@bb.utils.contains('LLVMVERSION', '10.0.1', '10.0.0', \ |
30 | bb.utils.contains('LLVMVERSION', '11.1.0', '11.0.0', \ | 30 | bb.utils.contains('LLVMVERSION', '12.0.0', '12.0.0', '13.0.0', d), d)}" |
31 | bb.utils.contains('LLVMVERSION', '12.0.0', '12.0.0', '13.0.0', d), d), d)}" | ||
32 | PREFERRED_VERSION_opencl-clang-native ?= "${@bb.utils.contains('LLVMVERSION', '10.0.1', '10.0.0', \ | 31 | PREFERRED_VERSION_opencl-clang-native ?= "${@bb.utils.contains('LLVMVERSION', '10.0.1', '10.0.0', \ |
33 | bb.utils.contains('LLVMVERSION', '11.1.0', '11.0.0', \ | 32 | bb.utils.contains('LLVMVERSION', '12.0.0', '12.0.0', '13.0.0', d), d)}" |
34 | bb.utils.contains('LLVMVERSION', '12.0.0', '12.0.0', '13.0.0', d), d), d)}" | ||
35 | 33 | ||
36 | XSERVER_X86_ASPEED_AST = "xf86-video-ast \ | 34 | XSERVER_X86_ASPEED_AST = "xf86-video-ast \ |
37 | " | 35 | " |