meta-handheld: append to BBPATH instead of prepend so order of bblayers.conf is respected
PATCH 1/1 meta-handheld: append to BBPATH instead of prepend so order of bblayers.conf is respected
--- conf/layer.conf | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-)
conf/layer.conf +8 -3
@@ -1,13 +1,18 @@ # Layer configuration for meta-handheld layer # Copyright 2011 Intel Corporation -# We have a conf and classes directory, prepend to BBPATH to prefer our versions -BBPATH := "${LAYERDIR}:${BBPATH}" +# We have a conf and classes directory, append to BBPATH +BBPATH .= ":${LAYERDIR}" # We have a recipes directory, add to BBFILES -BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb ${LAYERDIR}/recipes-*/*/*.bbappend" +BBFILES += "${LAYERDIR}/recipes-*/*/*.bb ${LAYERDIR}/recipes-*/*/*.bbappend" BBFILE_COLLECTIONS += "meta-handheld" BBFILE_PATTERN_meta-handheld := "^${LAYERDIR}/" + +# Define the priority for recipes (.bb files) from this layer, +# choosing carefully how this layer interacts with all of the +# other layers. + BBFILE_PRIORITY_meta-handheld = "7"
Signature · 1 line
1.7.8.6
Quoted 1 line · Martin Jansa
Signed-off-by Martin Jansa <[email protected]>
ping
Quoted 33 lines
--- conf/layer.conf | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-)conf/layer.conf +8
-3@@ -1,13 +1,18 @@ # Layer configuration for meta-handheld layer # Copyright 2011 Intel Corporation -# We have a conf and classes directory, prepend to BBPATH to prefer our versions -BBPATH := "${LAYERDIR}:${BBPATH}" +# We have a conf and classes directory, append to BBPATH +BBPATH .= ":${LAYERDIR}" # We have a recipes directory, add to BBFILES -BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb ${LAYERDIR}/recipes-*/*/*.bbappend" +BBFILES += "${LAYERDIR}/recipes-*/*/*.bb ${LAYERDIR}/recipes-*/*/*.bbappend" BBFILE_COLLECTIONS += "meta-handheld" BBFILE_PATTERN_meta-handheld := "^${LAYERDIR}/" + +# Define the priority for recipes (.bb files) from this layer, +# choosing carefully how this layer interacts with all of the +# other layers. + BBFILE_PRIORITY_meta-handheld = "7"Signature · 1 line
1.7.8.6
Signature · 1 line
Martin 'JaMa' Jansa jabber: [email protected]
Quoted 24 lines · On Saturday 16 June 2012 09:01:17 Martin Jansa wrote:
Quoted 1 line · Martin Jansa
Signed-off-by Martin Jansa <[email protected]>ping
Quoted 19 lines
---
conf/layer.conf | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-)conf/layer.conf +0
-1@@ -1,13 +1,18 @@ # Layer configuration for meta-handheld layer # Copyright 2011 Intel Corporation -# We have a conf and classes directory, prepend to BBPATH to prefer ourversions -BBPATH := "${LAYERDIR}:${BBPATH}"
conf/layer.conf +2
-0+# We have a conf and classes directory, append to BBPATH +BBPATH .= ":${LAYERDIR}"
Quoted 8 lines
Quoted 8 lines
# We have a recipes directory, add to BBFILES
-BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb ${LAYERDIR}/recipes-*/*/*.bbappend"
+BBFILES +=
"${LAYERDIR}/recipes-*/*/*.bb ${LAYERDIR}/recipes-*/*/*.bbappend">
BBFILE_COLLECTIONS+= "meta-handheld" BBFILE_PATTERN_meta-handheld := "^${LAYERDIR}/"
I was all set to apply this now (sorry for the delay) and then I noticed you changed the above without comment - why was that?
Cheers,
Paul
Signature · 2 lines
Paul Eggleton Intel Open Source Technology Centre
Quoted 27 lines · Paul Eggleton
Quoted 26 lines · On Saturday 16 June 2012 09:01:17 Martin Jansa wrote:
Quoted 1 line · Martin Jansa
Signed-off-by Martin Jansa <[email protected]>ping
Quoted 21 lines
---
conf/layer.conf | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-)conf/layer.conf +0
-1@@ -1,13 +1,18 @@ # Layer configuration for meta-handheld layer # Copyright 2011 Intel Corporation -# We have a conf and classes directory, prepend to BBPATH to prefer ourversions -BBPATH := "${LAYERDIR}:${BBPATH}"
conf/layer.conf +2
-0+# We have a conf and classes directory, append to BBPATH +BBPATH .= ":${LAYERDIR}" # We have a recipes directory, add to BBFILES
Quoted 9 lines
Quoted 6 lines
Quoted 6 lines
-BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb ${LAYERDIR}/recipes-*/*/*.bbappend"
+BBFILES +=
"${LAYERDIR}/recipes-*/*/*.bb ${LAYERDIR}/recipes-*/*/*.bbappend">
BBFILE_COLLECTIONS+= "meta-handheld" BBFILE_PATTERN_meta-handheld := "^${LAYERDIR}/"I was all set to apply this now (sorry for the delay) and then I noticed you changed the above without comment - why was that?
Just to match what other layers do, or is there some advantage of using := instead of += in BBFILES?
Cheers,
Signature · 1 line
Martin 'JaMa' Jansa jabber: [email protected]
Quoted 38 lines · Martin Jansa
Quoted 27 lines · Paul Eggleton
Quoted 26 lines · On Saturday 16 June 2012 09:01:17 Martin Jansa wrote:
Quoted 1 line · Martin Jansa
Signed-off-by Martin Jansa <[email protected]>ping
Quoted 21 lines
---
conf/layer.conf | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-)conf/layer.conf +0
-1@@ -1,13 +1,18 @@ # Layer configuration for meta-handheld layer # Copyright 2011 Intel Corporation -# We have a conf and classes directory, prepend to BBPATH to prefer ourversions -BBPATH := "${LAYERDIR}:${BBPATH}"
conf/layer.conf +2
-0+# We have a conf and classes directory, append to BBPATH +BBPATH .= ":${LAYERDIR}" # We have a recipes directory, add to BBFILESQuoted 9 lines
Quoted 6 lines
Quoted 6 lines
-BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb ${LAYERDIR}/recipes-*/*/*.bbappend"
+BBFILES +=
"${LAYERDIR}/recipes-*/*/*.bb ${LAYERDIR}/recipes-*/*/*.bbappend">
BBFILE_COLLECTIONS+= "meta-handheld" BBFILE_PATTERN_meta-handheld := "^${LAYERDIR}/"I was all set to apply this now (sorry for the delay) and then I noticed you changed the above without comment - why was that?
Quoted 2 lines
Just to match what other layers do, or is there some advantage of using := instead of += in BBFILES?
And IIRC there was some discussion about BBFILES :=/+= on ML before ba31e4eabd31af63eb0244096c8bcdcac185fac6 changed it in other layers.
Cheers,
Signature · 1 line
Martin 'JaMa' Jansa jabber: [email protected]
Quoted 41 lines · On Saturday 16 June 2012 21:40:18 Martin Jansa wrote:
Quoted 40 lines · Martin Jansa
Quoted 38 lines · Paul Eggleton
Quoted 27 lines · On Saturday 16 June 2012 09:01:17 Martin Jansa wrote:
Quoted 1 line · Martin Jansa
Signed-off-by Martin Jansa <[email protected]>ping
Quoted 22 lines
---
conf/layer.conf | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-)conf/layer.conf +0
-1@@ -1,13 +1,18 @@ # Layer configuration for meta-handheld layer # Copyright 2011 Intel Corporation -# We have a conf and classes directory, prepend to BBPATH to preferour
versions -BBPATH := "${LAYERDIR}:${BBPATH}"conf/layer.conf +2
-0+# We have a conf and classes directory, append to BBPATH +BBPATH .= ":${LAYERDIR}" # We have a recipes directory, add to BBFILESQuoted 7 lines
Quoted 7 lines
-BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb ${LAYERDIR}/recipes-*/*/*.bbappend"
+BBFILES +=
"${LAYERDIR}/recipes-*/*/*.bb ${LAYERDIR}/recipes-*/*/*.bbappend">
BBFILE_COLLECTIONS+= "meta-handheld"
BBFILE_PATTERN_meta-handheld := "^${LAYERDIR}/"I was all set to apply this now (sorry for the delay) and then I noticed you changed the above without comment - why was that?
Quoted 6 lines
Quoted 3 lines
Just to match what other layers do, or is there some advantage of using
:= instead of += in BBFILES?
And IIRC there was some discussion about BBFILES :=/+= on ML before
ba31e4eabd31af63eb0244096c8bcdcac185fac6changed it in other layers.
Hmm, I couldn't find that discussion, but it doesn't seem to behave any differently; but looking at BitBake's layer.conf handling code we explicitly expand the LAYERDIR reference immediately anyway, so immediate expansion (:=) doesn't do anything. I guess this means the += form is perhaps preferred since it makes what we are trying to do more obvious.
Now I've understood the above I've merged this patch, thanks.
Cheers,
Paul
Signature · 2 lines
Paul Eggleton Intel Open Source Technology Centre