diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2013-04-13 14:16:51 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-04-15 16:22:06 +0200 |
| commit | 8b465f791a5ef3d9ef138a206c6fb9c3bbcb55b1 (patch) | |
| tree | b807d6c2125baa9b4decb907ccf4894f0c0f92db | |
| parent | 7de9451c982d9156226789a0e2f3b9251e234aba (diff) | |
| download | meta-openembedded-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>
| -rw-r--r-- | meta-systemd/conf/layer.conf | 11 | ||||
| -rw-r--r-- | 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 c064333bfb..f3fc45d002 100644 --- a/meta-systemd/conf/layer.conf +++ b/meta-systemd/conf/layer.conf | |||
| @@ -15,17 +15,6 @@ BBPATH .= ":${LAYERDIR}" | |||
| 15 | BBFILES += "\ | 15 | BBFILES += "\ |
| 16 | ${LAYERDIR}/recipes-*/*/*.bb \ | 16 | ${LAYERDIR}/recipes-*/*/*.bb \ |
| 17 | ${LAYERDIR}/oe-core/recipes-*/*/*.bbappend \ | 17 | ${LAYERDIR}/oe-core/recipes-*/*/*.bbappend \ |
| 18 | ${LAYERDIR}/meta-oe/recipes-*/*/*.bbappend \ | ||
| 19 | ${@base_contains('BBFILE_COLLECTIONS', 'systemd-layer',\ | ||
| 20 | '', '${LAYERDIR}/invalid.bb', d)} \ | ||
| 21 | ${@base_contains('BBFILE_COLLECTIONS', 'gnome-layer',\ | ||
| 22 | '${LAYERDIR}/meta-gnome/recipes-*/*/*.bbappend', '', d)} \ | ||
| 23 | ${@base_contains('BBFILE_COLLECTIONS', 'multimedia-layer',\ | ||
| 24 | '${LAYERDIR}/meta-multimedia/recipes-*/*/*.bbappend', '', d)} \ | ||
| 25 | ${@base_contains('BBFILE_COLLECTIONS', 'networking',\ | ||
| 26 | '${LAYERDIR}/meta-networking/recipes-*/*/*.bbappend', '', d)} \ | ||
| 27 | ${@base_contains('BBFILE_COLLECTIONS', 'xfce-layer',\ | ||
| 28 | '${LAYERDIR}/meta-xfce/recipes-*/*/*.bbappend', '', d)} \ | ||
| 29 | " | 18 | " |
| 30 | 19 | ||
| 31 | BBFILE_COLLECTIONS += "systemd-layer" | 20 | 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 @@ | |||
| 1 | Content of this file is invalid and is used by conf/layer.conf to | ||
| 2 | ensure that BBFILES is expanded after BBFILE_COLLECTIONS. | ||
