From 8b465f791a5ef3d9ef138a206c6fb9c3bbcb55b1 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 13 Apr 2013 14:16:51 +0200 Subject: layer.conf: remove detection of other layers, now there are only oe-core bbappends Signed-off-by: Martin Jansa --- meta-systemd/conf/layer.conf | 11 ----------- meta-systemd/invalid.bb | 2 -- 2 files changed, 13 deletions(-) delete mode 100644 meta-systemd/invalid.bb (limited to 'meta-systemd') diff --git a/meta-systemd/conf/layer.conf b/meta-systemd/conf/layer.conf index c064333bf..f3fc45d00 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 b16787bce..000000000 --- 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. -- cgit v1.2.3-54-g00ecf