[oe-commits] Martin Jansa : layer.conf: remove detection of other layers, now there are only oe-core bbappends

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master
Commit: 8b465f791a5ef3d9ef138a206c6fb9c3bbcb55b1
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=8b465f791a5ef3d9ef138a206c6fb9c3bbcb55b1

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Sat Apr 13 14:16:51 2013 +0200

layer.conf: remove detection of other layers, now there are only oe-core bbappends

Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 meta-systemd/conf/layer.conf |   11 -----------
 meta-systemd/invalid.bb      |    2 --
 2 files changed, 0 insertions(+), 13 deletions(-)

diff --git a/meta-systemd/conf/layer.conf b/meta-systemd/conf/layer.conf
index c064333..f3fc45d 100644
--- a/meta-systemd/conf/layer.conf
+++ b/meta-systemd/conf/layer.conf
@@ -15,17 +15,6 @@ BBPATH .= ":${LAYERDIR}"
 BBFILES += "\
   ${LAYERDIR}/recipes-*/*/*.bb \
   ${LAYERDIR}/oe-core/recipes-*/*/*.bbappend \
-  ${LAYERDIR}/meta-oe/recipes-*/*/*.bbappend \
-  ${@base_contains('BBFILE_COLLECTIONS', 'systemd-layer',\
-                   '', '${LAYERDIR}/invalid.bb', d)} \
-  ${@base_contains('BBFILE_COLLECTIONS', 'gnome-layer',\
-                   '${LAYERDIR}/meta-gnome/recipes-*/*/*.bbappend', '', d)} \
-  ${@base_contains('BBFILE_COLLECTIONS', 'multimedia-layer',\
-                   '${LAYERDIR}/meta-multimedia/recipes-*/*/*.bbappend', '', d)} \
-  ${@base_contains('BBFILE_COLLECTIONS', 'networking',\
-                   '${LAYERDIR}/meta-networking/recipes-*/*/*.bbappend', '', d)} \
-  ${@base_contains('BBFILE_COLLECTIONS', 'xfce-layer',\
-                   '${LAYERDIR}/meta-xfce/recipes-*/*/*.bbappend', '', d)} \
 "
 
 BBFILE_COLLECTIONS += "systemd-layer"
diff --git a/meta-systemd/invalid.bb b/meta-systemd/invalid.bb
deleted file mode 100644
index b16787b..0000000
--- a/meta-systemd/invalid.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-Content of this file is invalid and is used by conf/layer.conf to
-ensure that BBFILES is expanded after BBFILE_COLLECTIONS.