From ddf943cfe84256fb25a367b27ce24b79f2f2884c Mon Sep 17 00:00:00 2001 From: Patrick Venture Date: Fri, 5 Apr 2019 18:31:05 -0700 Subject: meta-intel: layer.conf: Add warrior compatibility oe-core branched in preparation for the upcoming 2.7 Yocto release and as of 13e45ff requires core layer compatibility to "warrior" instead of "thud". We'll retain compatibility for both until we do our own branch or stop testing thud. (From meta-intel rev: 8a61b573a9f4586ba204fd38e71433575872e8aa) Signed-off-by: Patrick Venture Change-Id: Ie818ed3781969761beaeb8aaccaedf43dd841dbc Signed-off-by: Brad Bishop --- meta-intel/conf/layer.conf | 2 +- meta-intel/meta-s2600wf/conf/layer.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-intel/conf/layer.conf b/meta-intel/conf/layer.conf index 539e4764e..99a6df061 100644 --- a/meta-intel/conf/layer.conf +++ b/meta-intel/conf/layer.conf @@ -8,7 +8,7 @@ BBFILES += "${LAYERDIR}/meta-common/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "intel" BBFILE_PATTERN_intel = "" LAYERVERSION_intel = "1" -LAYERSERIES_COMPAT_intel = "thud" +LAYERSERIES_COMPAT_intel = "thud warrior" # Provide a variable that points the base of the intel layer. INTELBASE = '${@os.path.normpath("${LAYERDIR}/")}' diff --git a/meta-intel/meta-s2600wf/conf/layer.conf b/meta-intel/meta-s2600wf/conf/layer.conf index 357dc2fdf..3fb9534dc 100644 --- a/meta-intel/meta-s2600wf/conf/layer.conf +++ b/meta-intel/meta-s2600wf/conf/layer.conf @@ -8,4 +8,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "s2600wf" BBFILE_PATTERN_s2600wf = "" BBFILE_PRIORITY_s2600wf = "5" -LAYERSERIES_COMPAT_s2600wf = "thud" +LAYERSERIES_COMPAT_s2600wf = "thud warrior" -- cgit v1.2.3