1 files changed, 24 insertions, 3 deletions

diff --git a/conf/layer.conf b/conf/layer.conf
index 63e9e5ea..97dfb897 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -10,15 +10,36 @@ BBFILE_PATTERN_intel := "^${LAYERDIR}/"
 BBFILE_PRIORITY_intel = "5"
 
 # Additional license directories.
-LICENSE_PATH += "${LAYERDIR}/custom-licenses"
+CUSTOM_LICENSES_PATH = "${LAYERDIR}/custom-licenses"
+LICENSE_PATH += "${CUSTOM_LICENSES_PATH}"
 
 LAYERDEPENDS_intel = "core"
-LAYERRECOMMENDS_intel = "dpdk intel-qat"
+LAYERRECOMMENDS_intel = "dpdk"
 
 # This should only be incremented on significant changes that will
 # cause compatibility issues with other layers
 LAYERVERSION_intel = "5"
-LAYERSERIES_COMPAT_intel = "thud"
+LAYERSERIES_COMPAT_intel = "kirkstone scarthgap"
 
+BBFILES_DYNAMIC += " \
+    clang-layer:${LAYERDIR}/dynamic-layers/clang-layer/*/*/*.bb \
+    clang-layer:${LAYERDIR}/dynamic-layers/clang-layer/*/*/*.bbappend \
+    openembedded-layer:${LAYERDIR}/dynamic-layers/openembedded-layer/*/*/*.bb \
+    openembedded-layer:${LAYERDIR}/dynamic-layers/openembedded-layer/*/*/*.bbappend \
+    meta-python:${LAYERDIR}/dynamic-layers/meta-python/*/*/*.bb \
+    meta-python:${LAYERDIR}/dynamic-layers/meta-python/*/*/*.bbappend \
+"
 
 require ${LAYERDIR}/conf/include/maintainers.inc
+
+# Use the libva from OE-Core when layer is included but no MACHINE
+# from meta-intel is being used.
+PREFERRED_PROVIDER_libva ?= "libva"
+PREFERRED_PROVIDER_libva-native ?= "libva-native"
+PREFERRED_PROVIDER_nativesdk-libva ?= "nativesdk-libva"
+
+PREFERRED_PROVIDER_libva-utils ?= "libva-utils"
+PREFERRED_PROVIDER_libva-utils-native ?= "libva-utils-native"
+PREFERRED_PROVIDER_nativesdk-libva-utils ?= "nativesdk-libva-utils"
+
+# addpylib ${LAYERDIR}/lib oeqa