Patchwork [RFC,meta-oe,03/27] layer.conf/README: search directory structure for bbappends changed

login
register
mail settings
Submitter Andreas Müller
Date June 10, 2012, 9:46 p.m.
Message ID <1339364820-2880-4-git-send-email-schnitzeltony@googlemail.com>
Download mbox | patch
Permalink /patch/29601/
State Superseded
Headers show

Comments

Andreas Müller - June 10, 2012, 9:46 p.m.
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 meta-systemd/README          |    5 +++++
 meta-systemd/conf/layer.conf |    2 +-
 2 files changed, 6 insertions(+), 1 deletions(-)
Khem Raj - June 10, 2012, 11:12 p.m.
On Sun, Jun 10, 2012 at 2:46 PM, Andreas Müller
<schnitzeltony@googlemail.com> wrote:
> -BBFILES += "${LAYERDIR}/recipes-*/*/*.bb ${LAYERDIR}/recipes-*/*/*.bbappend"
> +BBFILES += "${LAYERDIR}/recipes-*/*/*.bb ${LAYERDIR}/*/recipes-*/*/*.bbappend"

why only for bbappends and why not for bb files as well can you explain this
change a bit and its usecases
Andreas Müller - June 11, 2012, 8:52 a.m.
On Mon, Jun 11, 2012 at 1:12 AM, Khem Raj <raj.khem@gmail.com> wrote:
> On Sun, Jun 10, 2012 at 2:46 PM, Andreas Müller
> <schnitzeltony@googlemail.com> wrote:
>> -BBFILES += "${LAYERDIR}/recipes-*/*/*.bb ${LAYERDIR}/recipes-*/*/*.bbappend"
>> +BBFILES += "${LAYERDIR}/recipes-*/*/*.bb ${LAYERDIR}/*/recipes-*/*/*.bbappend"
>
> why only for bbappends and why not for bb files as well can you explain this
> change a bit and its usecases
>
I think all systemd related stuff should finally live in meta-systemd
to make other layers independent of using systemd or not. I separated
two types of metadata:
1. Recipes/classes only found in this layer - like systemd itself (or
later e.g dietsplash designed to work only with systemd)
2. Extends of other layers (currently meta-oe/meta-gnome/meta-efl -
and in the future e.g oe-core/meta-ti/meta-angstrom...). For this an
additional directory hierarchy was added to give a better chance to
BBMASK. E.g a user wants to use systemd but does not want meta-ti. The
idea of only having bbappends was to force only appending not
overriding recipes of other layers.

Andreas

Patch

diff --git a/meta-systemd/README b/meta-systemd/README
index efed2ee..6c67933 100644
--- a/meta-systemd/README
+++ b/meta-systemd/README
@@ -10,6 +10,11 @@  URI: git://git.openembedded.org/meta-openembedded
 branch: master
 revision: HEAD
 
+To make BBMASK'ing per layer possible the following directory structure is
+used:
+    
+$[LAYERDIR}/<layer name>/recipes-<group-name>/<recipe-name>/<recipe-name>.bbappend
+
 Send pull requests to openembedded-devel@lists.openembedded.org with '[meta-oe][meta-systemd]' in the subject'
 
 When sending single patches, please use something like 'git send-email -1 --to openembedded-devel@lists.openembedded.org --subject-prefix=meta-oe][meta-systemd][PATCH'
diff --git a/meta-systemd/conf/layer.conf b/meta-systemd/conf/layer.conf
index 9caec69..3310abc 100644
--- a/meta-systemd/conf/layer.conf
+++ b/meta-systemd/conf/layer.conf
@@ -12,7 +12,7 @@ 
 BBPATH .= ":${LAYERDIR}"
 
 # We have a recipes directory, add to BBFILES
-BBFILES += "${LAYERDIR}/recipes-*/*/*.bb ${LAYERDIR}/recipes-*/*/*.bbappend"
+BBFILES += "${LAYERDIR}/recipes-*/*/*.bb ${LAYERDIR}/*/recipes-*/*/*.bbappend"
 
 BBFILE_COLLECTIONS += "systemd-layer"
 BBFILE_PATTERN_systemd-layer := "^${LAYERDIR}/"