aboutsummaryrefslogtreecommitdiffstats
path: root/meta-systemd
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2013-04-13 14:16:51 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2013-04-15 16:22:06 +0200
commit8b465f791a5ef3d9ef138a206c6fb9c3bbcb55b1 (patch)
treeb807d6c2125baa9b4decb907ccf4894f0c0f92db /meta-systemd
parent7de9451c982d9156226789a0e2f3b9251e234aba (diff)
downloadmeta-openembedded-contrib-8b465f791a5ef3d9ef138a206c6fb9c3bbcb55b1.tar.gz
layer.conf: remove detection of other layers, now there are only oe-core bbappends
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-systemd')
-rw-r--r--meta-systemd/conf/layer.conf11
-rw-r--r--meta-systemd/invalid.bb2
2 files changed, 0 insertions, 13 deletions
diff --git a/meta-systemd/conf/layer.conf b/meta-systemd/conf/layer.conf
index c064333bfb..f3fc45d002 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 b16787bcee..0000000000
--- 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.