Skip to contentSkip to conversation

conf/layer.conf: Use .= for BBPATH and += for BBFILES

PATCH In review [email protected] 3 participants 9 messages May 6, 2011 – May 7, 2011

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 conf/layer.conf: Use .= for BBPATH and += for BBFILES

From: Khem Raj <[email protected]>

---
 meta-efl/conf/layer.conf   |    4 ++--
 meta-gnome/conf/layer.conf |    4 ++--
 meta-gpe/conf/layer.conf   |    4 ++--
 meta-oe/conf/layer.conf    |    4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)
meta-efl/conf/layer.conf +2 -2
index 85dbacd..f019337 100644
@@ -1,8 +1,8 @@
 # We have a conf and classes directory, prepend to BBPATH to prefer our versions
-BBPATH := "${LAYERDIR}:${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 += "efl-layer"
 BBFILE_PATTERN_efl-layer := "^${LAYERDIR}/"
meta-gnome/conf/layer.conf +2 -2
index c878ecf..6e8ff28 100644
@@ -1,8 +1,8 @@
 # We have a conf and classes directory, prepend to BBPATH to prefer our versions
-BBPATH := "${LAYERDIR}:${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 += "gnome-layer"
 BBFILE_PATTERN_gnome-layer := "^${LAYERDIR}/"
meta-gpe/conf/layer.conf +2 -2
index d250555..006b6af 100644
@@ -1,8 +1,8 @@
 # We have a conf and classes directory, prepend to BBPATH to prefer our versions
-BBPATH := "${LAYERDIR}:${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 += "gpe-layer"
 BBFILE_PATTERN_gpe-layer := "^${LAYERDIR}/"
meta-oe/conf/layer.conf +2 -2
index 9fa60c1..36137e9 100644
@@ -1,8 +1,8 @@
 # We have a conf and classes directory, prepend to BBPATH to prefer our versions
-BBPATH := "${LAYERDIR}:${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 += "openembedded-layer"
 BBFILE_PATTERN_openembedded-layer := "^${LAYERDIR}/"
Signature · 1 line
1.7.4.1
#1 lore raw

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Review

Quoted 6 lines · On 06-05-11 05:47, [email protected] wrote:

From: Khem Raj <[email protected]>

# We have a conf and classes directory, prepend to BBPATH to prefer our versions

(quoted diff) +1 -1
-BBPATH := "${LAYERDIR}:${BBPATH}"
+BBPATH .= ":${LAYERDIR}"

I haven't had my morning coffee yet, but that either doesn't prepend LAYERDIR to BBPATH or the colons are in the wrong place.

regards,

Koen
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD8DBQFNw4mZMkyGM64RGpERAsNyAJ9UJ4GJ6blWQaYpCRO6s2v9N55jDQCdHeoR gGUq5MZHntHS6d42OzHwjCM=
=G4SQ
-----END PGP SIGNATURE-----

author
#2 lore raw

-Khem

Quoted 7 lines · Koen Kooi

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Quoted 1 line · On 06-05-11 05:47, [email protected] wrote:

From: Khem Raj <[email protected]>

Quoted 7 lines

Review

Quoted 3 lines

# We have a conf and classes directory, prepend to BBPATH to prefer our versions

(quoted diff) +1 -1
-BBPATH := "${LAYERDIR}:${BBPATH}"
+BBPATH .= ":${LAYERDIR}"

I haven't had my morning coffee yet, but that either doesn't prepend LAYERDIR to BBPATH or the colons are in the wrong place.

Hmm I have sent similar patch for oe-core, git am that too and for other layers as well Now bit bake should arrange BBPATH per priority

Quoted 17 lines

regards,

Koen
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD8DBQFNw4mZMkyGM64RGpERAsNyAJ9UJ4GJ6blWQaYpCRO6s2v9N55jDQCdHeoR gGUq5MZHntHS6d42OzHwjCM=
=G4SQ
-----END PGP SIGNATURE-----

_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

#3 lore raw
In reply to [email protected]

Review

Quoted 3 lines · On Thu, 2011-05-05 at 20:47 -0700, [email protected] wrote:

# We have a conf and classes directory, prepend to BBPATH to prefer our versions

(quoted diff) +1 -1
-BBPATH := "${LAYERDIR}:${BBPATH}"
+BBPATH .= ":${LAYERDIR}"

This patch seems to cause the code to do the opposite of what the comment says. If changing it to be an append rather than a prepend is deliberate, please adjust the comment to match. (It would also be nice to have some commentary in the commit message explaining why this is being done, since it isn't obvious to me why append would be better.)

p.

author
#4 lore raw
Quoted 11 lines · Phil Blundell

Review

Quoted 3 lines · On Thu, 2011-05-05 at 20:47 -0700, [email protected] wrote:

 # We have a conf and classes directory, prepend to BBPATH to prefer our versions

(quoted diff) +1 -1
-BBPATH := "${LAYERDIR}:${BBPATH}"
+BBPATH .= ":${LAYERDIR}"

This patch seems to cause the code to do the opposite of what the comment says.  If changing it to be an append rather than a prepend is deliberate, please adjust the comment to match.  (It would also be nice to have some commentary in the commit message explaining why this is being done, since it isn't obvious to me why append would be better.)

That comment should be fixed. Since previously I has prepend and then changed it to append but forgot
to correct the comment.
It needed to follow some order for consistency and I chose append. Now it depends on the order of
layers specified in BBLAYERS from bblayer.conf. Which means 1st entry gets priority
over second entry when bitbake searches BBPATH. Right now there are two criteria's
BBFILES are selected per priority set by BBFILES_PRIORITY for the layer but BBPATHs dont have this
capability they get searched as they appear in the list. Ideally I would think it would be simpler to have just one order for BBFILES and BBPATH
so if BBPATHS followed the BBFILES priority too would make it easier to comprehend.

Quoted 10 lines

p.

_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

#5 lore raw

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Quoted 12 lines · Khem Raj
Quoted 11 lines · Phil Blundell

Review

Quoted 3 lines · On Thu, 2011-05-05 at 20:47 -0700, [email protected] wrote:

# We have a conf and classes directory, prepend to BBPATH to prefer our versions

(quoted diff) +1 -1
-BBPATH := "${LAYERDIR}:${BBPATH}"
+BBPATH .= ":${LAYERDIR}"

This patch seems to cause the code to do the opposite of what the comment says. If changing it to be an append rather than a prepend is deliberate, please adjust the comment to match. (It would also be nice to have some commentary in the commit message explaining why this is being done, since it isn't obvious to me why append would be better.)

Quoted 16 lines

That comment should be fixed. Since previously I has prepend and then changed it to append but forgot
to correct the comment.
It needed to follow some order for consistency and I chose append. Now it depends on the order of
layers specified in BBLAYERS from bblayer.conf. Which means 1st entry gets priority
over second entry when bitbake searches BBPATH. Right now there are two criteria's
BBFILES are selected per priority set by BBFILES_PRIORITY for the layer but BBPATHs dont have this
capability they get searched as they appear in the list. Ideally I would think it would be simpler to have just one order for BBFILES and BBPATH
so if BBPATHS followed the BBFILES priority too would make it easier to comprehend.

For meta-oe we need 2 different things:

1) prepend to BBPATH to get our classes in first (e.g. kernel.bbclass, gnome.bbclass)
2) append to BBFILES to use our version of recipes (.bbs) and overrides (.bbappends)

It seems that using layer priorities won't work the way we need it.

regards,

Koen
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD8DBQFNxGddMkyGM64RGpERAtQMAJwM1W5k0Z9CgxlBYq82O6b39kLDcwCfTNO7 Qv6TUjazbpj5vYb6Ex0nxWQ=
=J/NZ
-----END PGP SIGNATURE-----

author
#6 lore raw
Quoted 33 lines · Koen Kooi

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Quoted 12 lines · Khem Raj
Quoted 11 lines · Phil Blundell

Review

Quoted 3 lines · On Thu, 2011-05-05 at 20:47 -0700, [email protected] wrote:

 # We have a conf and classes directory, prepend to BBPATH to prefer our versions

(quoted diff) +1 -1
-BBPATH := "${LAYERDIR}:${BBPATH}"
+BBPATH .= ":${LAYERDIR}"

This patch seems to cause the code to do the opposite of what the comment says.  If changing it to be an append rather than a prepend is deliberate, please adjust the comment to match.  (It would also be nice to have some commentary in the commit message explaining why this is being done, since it isn't obvious to me why append would be better.)

Quoted 16 lines

That comment should be fixed. Since previously I has prepend and then changed it to append but forgot
to correct the comment.
It needed to follow some order for consistency and I chose append. Now it depends on the order of
layers specified in BBLAYERS from bblayer.conf. Which means 1st entry gets priority
over second entry when bitbake searches BBPATH. Right now there are two criteria's
BBFILES are selected per priority set by BBFILES_PRIORITY for the layer but BBPATHs dont have this
capability they get searched as they appear in the list.  Ideally I would think it would be simpler to have just one order for BBFILES and BBPATH
so if BBPATHS followed the BBFILES priority too would make it easier to comprehend.

Quoted 8 lines

For meta-oe we need 2 different things:

1) prepend to BBPATH to get our classes in first (e.g. kernel.bbclass, gnome.bbclass)
2) append to BBFILES to use our version of recipes (.bbs) and overrides (.bbappends)

It seems that using layer priorities won't work the way we need it.

we can change the order in BBLAYERS define in oebb.sh to achieve that so higest priority layer in terms of BBPATH appears first and so on

Quoted 18 lines

regards,

Koen
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD8DBQFNxGddMkyGM64RGpERAtQMAJwM1W5k0Z9CgxlBYq82O6b39kLDcwCfTNO7 Qv6TUjazbpj5vYb6Ex0nxWQ=
=J/NZ
-----END PGP SIGNATURE-----

_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

#7 lore raw

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Quoted 31 lines · Khem Raj

On Fri, May 6, 2011 at 2:25 PM, Koen Kooi <[email protected]> wrote:

Quoted 12 lines · Khem Raj
Quoted 12 lines
Quoted 12 lines · Phil Blundell
Quoted 11 lines · On Thu, 2011-05-05 at 20:47 -0700, [email protected] wrote:

Review

Quoted 3 lines

# We have a conf and classes directory, prepend to BBPATH to prefer our versions

(quoted diff) +1 -1
-BBPATH := "${LAYERDIR}:${BBPATH}"
+BBPATH .= ":${LAYERDIR}"

This patch seems to cause the code to do the opposite of what the comment says. If changing it to be an append rather than a prepend is deliberate, please adjust the comment to match. (It would also be nice to have some commentary in the commit message explaining why this is being done, since it isn't obvious to me why append would be better.)

Quoted 16 lines
Quoted 8 lines
Quoted 8 lines

That comment should be fixed. Since previously I has prepend and then changed it to append but forgot
to correct the comment.
It needed to follow some order for consistency and I chose append. Now it depends on the order of
layers specified in BBLAYERS from bblayer.conf. Which means 1st entry gets priority
over second entry when bitbake searches BBPATH. Right now there are

Quoted 8 lines
Quoted 8 lines

two criteria's
BBFILES are selected per priority set by BBFILES_PRIORITY for the layer but BBPATHs dont have this
capability they get searched as they appear in the list. Ideally I would think it would be simpler to have just one order for BBFILES and BBPATH
so if BBPATHS followed the BBFILES priority too would make it easier to comprehend.

Quoted 11 lines

For meta-oe we need 2 different things:

1) prepend to BBPATH to get our classes in first (e.g. kernel.bbclass, gnome.bbclass)
2) append to BBFILES to use our version of recipes (.bbs) and overrides (.bbappends)

It seems that using layer priorities won't work the way we need it.

Quoted 2 lines

we can change the order in BBLAYERS define in oebb.sh to achieve that so higest priority layer in terms of BBPATH appears first and so on

That only fixes BBPATH, but not BBFILES :(
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD4DBQFNxOuGMkyGM64RGpERArpFAJ9HNwWB8IfyttZh46IZCo37unkcwACXQnZi SCM+PoZfIwKgplELJyZD/A==
=2TIM
-----END PGP SIGNATURE-----

author
#8 lore raw
Quoted 42 lines · Koen Kooi

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Quoted 38 lines · Khem Raj

On Fri, May 6, 2011 at 2:25 PM, Koen Kooi <[email protected]> wrote:

Quoted 12 lines · Khem Raj
Quoted 12 lines
Quoted 12 lines · Phil Blundell
Quoted 11 lines · On Thu, 2011-05-05 at 20:47 -0700, [email protected] wrote:

Review

Quoted 3 lines

 # We have a conf and classes directory, prepend to BBPATH to prefer our versions

(quoted diff) +1 -1
-BBPATH := "${LAYERDIR}:${BBPATH}"
+BBPATH .= ":${LAYERDIR}"

This patch seems to cause the code to do the opposite of what the comment says.  If changing it to be an append rather than a prepend is deliberate, please adjust the comment to match.  (It would also be nice to have some commentary in the commit message explaining why this is being done, since it isn't obvious to me why append would be better.)

Quoted 16 lines
Quoted 8 lines
Quoted 8 lines

That comment should be fixed. Since previously I has prepend and then changed it to append but forgot
to correct the comment.
It needed to follow some order for consistency and I chose append. Now it depends on the order of
layers specified in BBLAYERS from bblayer.conf. Which means 1st entry gets priority
over second entry when bitbake searches BBPATH. Right now there are

Quoted 8 lines
Quoted 8 lines

two criteria's
BBFILES are selected per priority set by BBFILES_PRIORITY for the layer but BBPATHs dont have this
capability they get searched as they appear in the list.  Ideally I would think it would be simpler to have just one order for BBFILES and BBPATH
so if BBPATHS followed the BBFILES priority too would make it easier to comprehend.

For meta-oe we need 2 different things:

1) prepend to BBPATH to get our classes in first (e.g. kernel.bbclass, gnome.bbclass)
2) append to BBFILES to use our version of recipes (.bbs) and overrides (.bbappends)

Quoted 6 lines
Quoted 4 lines

It seems that using layer priorities won't work the way we need it.

Quoted 2 lines

we can change the order in BBLAYERS define in oebb.sh to achieve that so higest priority layer in terms of BBPATH appears first and so on

That only fixes BBPATH, but not BBFILES :(

BBFILES order does not matter its the BBFILES_PRIORITY that matters when it comes to bitbake preferring recipes in contention but some classes like metadata_scm.bbclass expects oe-core's entries to appear first in the BBFILES list we can make that in oe-core such that it prepends using =+ or even manually.

Quoted 14 lines

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD4DBQFNxOuGMkyGM64RGpERArpFAJ9HNwWB8IfyttZh46IZCo37unkcwACXQnZi SCM+PoZfIwKgplELJyZD/A==
=2TIM
-----END PGP SIGNATURE-----

_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel