From 8962af850b3317680b88f0d8fa10df5787747e27 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@digia.com>
Date: Tue, 23 Sep 2014 15:17:53 +0300
Subject: Move meta-toradex specific files to separate layer

Create new layer for recipes and files that required only when
meta-toradex layer is used. For now, the bblayers.conf
template still includes the new layer as well.

Change-Id: Ib2c81a444786845f2e7c2fbf78dd0676459996c0
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@digia.com>
---
 conf/bblayers.conf.sample                          |  1 +
 meta-toradex-extras/conf/layer.conf                | 33 ++++++++++++++++++++++
 .../recipes/linux/linux-toradex-fsl_git.bbappend   | 29 +++++++++++++++++++
 recipes/linux/linux-toradex-fsl_git.bbappend       | 29 -------------------
 4 files changed, 63 insertions(+), 29 deletions(-)
 create mode 100644 meta-toradex-extras/conf/layer.conf
 create mode 100644 meta-toradex-extras/recipes/linux/linux-toradex-fsl_git.bbappend
 delete mode 100644 recipes/linux/linux-toradex-fsl_git.bbappend

diff --git a/conf/bblayers.conf.sample b/conf/bblayers.conf.sample
index 2a6e8aa..46e69d8 100644
--- a/conf/bblayers.conf.sample
+++ b/conf/bblayers.conf.sample
@@ -41,6 +41,7 @@ BBLAYERS ?= " \
   ##COREBASE##/meta-b2qt/meta-ti-extras \
   ##COREBASE##/meta-b2qt/meta-fsl-extras \
   ##COREBASE##/meta-b2qt/meta-beagleboard-extras \
+  ##COREBASE##/meta-b2qt/meta-toradex-extras \
   "
 BBLAYERS_NON_REMOVABLE ?= " \
   ##COREBASE##/meta \
diff --git a/meta-toradex-extras/conf/layer.conf b/meta-toradex-extras/conf/layer.conf
new file mode 100644
index 0000000..aba9374
--- /dev/null
+++ b/meta-toradex-extras/conf/layer.conf
@@ -0,0 +1,33 @@
+#############################################################################
+##
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+##
+## This file is part of the Qt Enterprise Embedded Scripts of the Qt
+## framework.
+##
+## $QT_BEGIN_LICENSE$
+## Commercial License Usage Only
+## Licensees holding valid commercial Qt license agreements with Digia
+## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
+## may use this file in accordance with the terms contained in said license
+## agreement.
+##
+## For further information use the contact form at
+## http://qt.digia.com/contact-us.
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+# We have a conf and classes directory, append to BBPATH
+BBPATH .= ":${LAYERDIR}"
+
+# We have a recipes directory, add to BBFILES
+BBFILES += "${LAYERDIR}/recipes*/*/*.bb \
+            ${LAYERDIR}/recipes*/*/*.bbappend \
+            "
+
+BBFILE_COLLECTIONS += "b2qt_toradex"
+BBFILE_PATTERN_b2qt_toradex := "^${LAYERDIR}/"
+BBFILE_PRIORITY_b2qt_toradex = "20"
diff --git a/meta-toradex-extras/recipes/linux/linux-toradex-fsl_git.bbappend b/meta-toradex-extras/recipes/linux/linux-toradex-fsl_git.bbappend
new file mode 100644
index 0000000..0bcbad7
--- /dev/null
+++ b/meta-toradex-extras/recipes/linux/linux-toradex-fsl_git.bbappend
@@ -0,0 +1,29 @@
+#############################################################################
+##
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+##
+## This file is part of the Qt Enterprise Embedded Scripts of the Qt
+## framework.
+##
+## $QT_BEGIN_LICENSE$
+## Commercial License Usage Only
+## Licensees holding valid commercial Qt license agreements with Digia
+## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
+## may use this file in accordance with the terms contained in said license
+## agreement.
+##
+## For further information use the contact form at
+## http://qt.digia.com/contact-us.
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+# kernel image files are not needed in the image
+RDEPENDS_kernel-base = ""
+
+config_script () {
+	# FunctionFS for adb
+	echo "CONFIG_USB_FUNCTIONFS=m"  >> ${S}/.config
+}
diff --git a/recipes/linux/linux-toradex-fsl_git.bbappend b/recipes/linux/linux-toradex-fsl_git.bbappend
deleted file mode 100644
index 0bcbad7..0000000
--- a/recipes/linux/linux-toradex-fsl_git.bbappend
+++ /dev/null
@@ -1,29 +0,0 @@
-#############################################################################
-##
-## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-##
-## This file is part of the Qt Enterprise Embedded Scripts of the Qt
-## framework.
-##
-## $QT_BEGIN_LICENSE$
-## Commercial License Usage Only
-## Licensees holding valid commercial Qt license agreements with Digia
-## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
-## may use this file in accordance with the terms contained in said license
-## agreement.
-##
-## For further information use the contact form at
-## http://qt.digia.com/contact-us.
-##
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
-
-# kernel image files are not needed in the image
-RDEPENDS_kernel-base = ""
-
-config_script () {
-	# FunctionFS for adb
-	echo "CONFIG_USB_FUNCTIONFS=m"  >> ${S}/.config
-}
-- 
cgit v1.2.3-54-g00ecf