From d382d54f0a9a913791fca1d7f61e87fcfd32842b Mon Sep 17 00:00:00 2001
From: Joe MacDonald <joe_macdonald@mentor.com>
Date: Wed, 18 Feb 2015 22:43:56 -0500
Subject: layer: update configuration and dependencies

Add in support for optional bbappends based on the presence of other
layers in the project and move the lxc recipe to a meta-virtualization
location.

Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
---
 README                                                    | 13 +++++++++++++
 conf/layer.conf                                           |  9 +++++----
 meta-virtualization/recipes-containers/lxc/lxc_%.bbappend |  1 +
 recipes-containers/lxc/lxc_%.bbappend                     |  1 -
 4 files changed, 19 insertions(+), 5 deletions(-)
 create mode 100644 meta-virtualization/recipes-containers/lxc/lxc_%.bbappend
 delete mode 100644 recipes-containers/lxc/lxc_%.bbappend

diff --git a/README b/README
index 926d880..3fe8af4 100644
--- a/README
+++ b/README
@@ -34,6 +34,19 @@ the Yocto Project website:
 
 http://www.yoctoproject.org
 
+This layer also optionally depends on the following layers:
+
+URI: git://github.com/openembedded/meta-oe.git
+branch: master
+revision: HEAD
+layers: meta-oe
+        meta-networking
+        meta-python
+
+URI: git://git.yoctoproject.org/meta-virtualization
+branch: master
+revision: HEAD
+
 
 Maintenance
 -----------
diff --git a/conf/layer.conf b/conf/layer.conf
index 723f5a8..39ae7bf 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -5,6 +5,11 @@ BBPATH .= ":${LAYERDIR}"
 BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
             ${LAYERDIR}/recipes-*/*/*.bbappend"
 
+# Let us add layer-specific bbappends which are only applied when that
+# layer is included in our configuration
+BBFILES += "${@' '.join('${LAYERDIR}/%s/recipes*/*/*.bbappend' % layer \
+               for layer in BBFILE_COLLECTIONS.split())}"
+
 BBFILE_COLLECTIONS += "selinux"
 BBFILE_PATTERN_selinux = "^${LAYERDIR}/"
 BBFILE_PRIORITY_selinux = "5"
@@ -15,8 +20,4 @@ LAYERVERSION_selinux = "1"
 
 LAYERDEPENDS_selinux = " \
     core \
-    meta-python \
-    networking-layer \
-    openembedded-layer \
-    virtualization-layer \
 "
diff --git a/meta-virtualization/recipes-containers/lxc/lxc_%.bbappend b/meta-virtualization/recipes-containers/lxc/lxc_%.bbappend
new file mode 100644
index 0000000..8c11cac
--- /dev/null
+++ b/meta-virtualization/recipes-containers/lxc/lxc_%.bbappend
@@ -0,0 +1 @@
+inherit enable-selinux
diff --git a/recipes-containers/lxc/lxc_%.bbappend b/recipes-containers/lxc/lxc_%.bbappend
deleted file mode 100644
index 8c11cac..0000000
--- a/recipes-containers/lxc/lxc_%.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-inherit enable-selinux
-- 
cgit v1.2.3-54-g00ecf