summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-systemd/conf/layer.conf18
-rw-r--r--meta-systemd/invalid.bb2
2 files changed, 19 insertions, 1 deletions
diff --git a/meta-systemd/conf/layer.conf b/meta-systemd/conf/layer.conf
index 3310abc8af..d06cfa138e 100644
--- a/meta-systemd/conf/layer.conf
+++ b/meta-systemd/conf/layer.conf
@@ -12,7 +12,23 @@
12BBPATH .= ":${LAYERDIR}" 12BBPATH .= ":${LAYERDIR}"
13 13
14# We have a recipes directory, add to BBFILES 14# We have a recipes directory, add to BBFILES
15BBFILES += "${LAYERDIR}/recipes-*/*/*.bb ${LAYERDIR}/*/recipes-*/*/*.bbappend" 15BBFILES += "\
16 ${LAYERDIR}/recipes-*/*/*.bb \
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', 'efl-layer',\
24 '${LAYERDIR}/meta-efl/recipes-*/*/*.bbappend', '', d)} \
25 ${@base_contains('BBFILE_COLLECTIONS', 'multimedia-layer',\
26 '${LAYERDIR}/meta-multimedia/recipes-*/*/*.bbappend', '', d)} \
27 ${@base_contains('BBFILE_COLLECTIONS', 'networking',\
28 '${LAYERDIR}/meta-networking/recipes-*/*/*.bbappend', '', d)} \
29 ${@base_contains('BBFILE_COLLECTIONS', 'xfce-layer',\
30 '${LAYERDIR}/meta-xfce/recipes-*/*/*.bbappend', '', d)} \
31"
16 32
17BBFILE_COLLECTIONS += "systemd-layer" 33BBFILE_COLLECTIONS += "systemd-layer"
18BBFILE_PATTERN_systemd-layer := "^${LAYERDIR}/" 34BBFILE_PATTERN_systemd-layer := "^${LAYERDIR}/"
diff --git a/meta-systemd/invalid.bb b/meta-systemd/invalid.bb
new file mode 100644
index 0000000000..b16787bcee
--- /dev/null
+++ b/meta-systemd/invalid.bb
@@ -0,0 +1,2 @@
1Content of this file is invalid and is used by conf/layer.conf to
2ensure that BBFILES is expanded after BBFILE_COLLECTIONS.