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_macdon...@mentor.com>
---
README | 13 +++++++++++++
conf/layer.conf | 9 +++++----
.../recipes-containers}/lxc/lxc_%.bbappend | 0
3 files changed, 18 insertions(+), 4 deletions(-)
rename {recipes-containers =>
meta-virtualization/recipes-containers}/lxc/lxc_%.bbappend (100%)
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/recipes-containers/lxc/lxc_%.bbappend
b/meta-virtualization/recipes-containers/lxc/lxc_%.bbappend
similarity index 100%
rename from recipes-containers/lxc/lxc_%.bbappend
rename to meta-virtualization/recipes-containers/lxc/lxc_%.bbappend
--
1.9.1
--
_______________________________________________
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
