[oe-commits] Chris Larson : Reverse the order of OVERRIDES

git version control git at git.openembedded.org
Fri Oct 15 19:38:31 UTC 2010


Module: openembedded.git
Branch: master
Commit: 5b485324c2ac637e9fc6d40753ee64fd6907db69
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=5b485324c2ac637e9fc6d40753ee64fd6907db69

Author: Chris Larson <chris_larson at mentor.com>
Date:   Fri Oct 15 05:41:21 2010 +0000

Reverse the order of OVERRIDES

Given the current implementation of OVERRIDES in bitbake, the variable is
expected to contain elements in the order least specific to most specific,
however, our current usage of it does not match that.  As one example, "local"
is supposed to always be the most specific override, yet currently it's the
least specific.  As another example, currently the target architecture is seen
as more specific than the machine, which is also clearly wrong.

Big thanks to Chase Maupin for investigating and identifying this long
standing issue.

It becomes clear that a reversal of the current value will bring us to a more
sane behavior, and avoids the need for the dual overrides hack mentioned in
the comments, so this implements this reversal, and drops the unnecessary and
confusing comments.

This also introduces a MACHINE_OVERRIDES variable as a generic mechanism to
inject overrides elements which are more specific than the distro but less
specific than the machine, which is where things like MACHINE_CLASS or
SOC_FAMILY or the like would go.  This variable is *space* separated, to make
it easier and more convenient to assemble the variable incrementally.

Reported-by: Chase Maupin <chase.maupin at ti.com>
Signed-off-by: Chris Larson <chris_larson at mentor.com>
Acked-by: Chase Maupin <chase.maupin at ti.com>
Acked-by: Khem Raj <raj.khem at gmail.com>

---

 conf/bitbake.conf                             |   17 ++-----------
 conf/distro/include/arm-thumb.inc             |    6 ++--
 conf/distro/micro.conf                        |    6 ++--
 conf/distro/minimal.conf                      |    5 ++-
 conf/distro/shr.conf                          |    5 ++-
 conf/machine/fsg3be.conf                      |    2 +-
 conf/machine/kixrp435.conf                    |    2 +-
 conf/machine/nslu2be.conf                     |    2 +-
 conf/machine/nslu2le.conf                     |    2 +-
 docs/usermanual/chapters/common_use_cases.xml |   31 +++++++++++++++++++-----
 recipes/binutils/binutils_csl-arm-20050416.bb |    2 +-
 recipes/binutils/binutils_csl-arm-20050603.bb |    2 +-
 recipes/eglibc/eglibc-package.bbclass         |    2 +-
 recipes/glibc/glibc-package.inc               |    2 +-
 recipes/prelink/prelink_20061027.bb           |    2 +-
 recipes/prelink/prelink_20071009.bb           |    2 +-
 recipes/prelink/prelink_20090925.bb           |    2 +-
 17 files changed, 50 insertions(+), 42 deletions(-)

Diff:   http://gitweb.openembedded.net/?p=openembedded.git/?a=commitdiff;h=5b485324c2ac637e9fc6d40753ee64fd6907db69




More information about the Openembedded-commits mailing list