From be2f69556bc35885454bb51b7fbc1b188b9e7e27 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jan-Simon=20M=C3=B6ller?= <jsmoeller@linuxfoundation.org>
Date: Fri, 3 Mar 2017 14:28:34 +0100
Subject: [PATCH] Splice out distro configuration in own layer for
 compatibility
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Upstream is working on guidelines for DISTRO and BSP layers.
One outcome is the yocto-compat-layer tool.

A requirement for BSP and DISTRO layers is that they are single-purpose
aka just defining the distro and only defining the BSP.

To comply with this, move the distro out into meta-agl-distro and adapt the templates.

Bug-AGL: SPEC-472

Change-Id: I921127edc78e677bd75d42a793f0b3708a54dd79
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
---
 .../conf/distro/include/arm-default-tune.inc           | 18 ++++++++++++++++++
 .../conf/distro/poky-agl.conf                          |  0
 meta-agl-distro/conf/layer.conf                        | 10 ++++++++++
 templates/base/bblayers.conf.sample                    |  1 +
 4 files changed, 29 insertions(+)
 create mode 100644 meta-agl-distro/conf/distro/include/arm-default-tune.inc
 rename {meta-agl => meta-agl-distro}/conf/distro/poky-agl.conf (100%)
 create mode 100644 meta-agl-distro/conf/layer.conf

diff --git a/meta-agl-distro/conf/distro/include/arm-default-tune.inc b/meta-agl-distro/conf/distro/include/arm-default-tune.inc
new file mode 100644
index 000000000..5a6f44fe5
--- /dev/null
+++ b/meta-agl-distro/conf/distro/include/arm-default-tune.inc
@@ -0,0 +1,18 @@
+def arm_tune_handler(d):
+    features = d.getVar('TUNE_FEATURES', True).split()
+    if 'armv7a' in features or 'armv7ve' in features:
+        tune = 'armv7athf'
+        if 'bigendian' in features:
+            tune += 'b'
+        if 'vfpv3' in features:
+            tune += '-vfpv3'
+        if 'vfpv3d16' in features:
+            tune += '-vfpv3d16'
+        if 'neon' in features:
+            tune += '-neon'
+        if 'vfpv4' in features:
+            tune += '-vfpv4'
+    else:
+        tune = d.getVar('DEFAULTTUNE', True)
+    return tune
+DEFAULTTUNE_agl := "${@arm_tune_handler(d)}"
diff --git a/meta-agl/conf/distro/poky-agl.conf b/meta-agl-distro/conf/distro/poky-agl.conf
similarity index 100%
rename from meta-agl/conf/distro/poky-agl.conf
rename to meta-agl-distro/conf/distro/poky-agl.conf
diff --git a/meta-agl-distro/conf/layer.conf b/meta-agl-distro/conf/layer.conf
new file mode 100644
index 000000000..74527516a
--- /dev/null
+++ b/meta-agl-distro/conf/layer.conf
@@ -0,0 +1,10 @@
+# We have a conf and classes directory, add to BBPATH
+BBPATH =. "${LAYERDIR}:"
+
+# We have recipes-* directories, add to BBFILES
+BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
+            ${LAYERDIR}/recipes-*/*/*.bbappend"
+
+BBFILE_COLLECTIONS += "agl-distro"
+BBFILE_PATTERN_agl-distro = "^${LAYERDIR}/"
+BBFILE_PRIORITY_agl-distro = "8"
diff --git a/templates/base/bblayers.conf.sample b/templates/base/bblayers.conf.sample
index ebba0d7f7..12f750c70 100644
--- a/templates/base/bblayers.conf.sample
+++ b/templates/base/bblayers.conf.sample
@@ -25,6 +25,7 @@ YOCTO_LAYERS = " \
 AGL_CORE_LAYERS = " \
   ${METADIR}/meta-agl/meta-ivi-common \
   ${METADIR}/meta-agl/meta-agl \
+  ${METADIR}/meta-agl/meta-agl-distro \
   ${METADIR}/meta-agl/meta-agl-bsp \
   "
 
-- 
2.16.6